t76 - code cleanup