t151 - code cleanup