TTF code rearragements; Cosmetic code changes