T S2: fixed some indent to shut wmlindent up
T S1: preliminary reduction of 'hand holding'