[tz] suggestions for potential code improvements?