STY: more aesthetic changes