re-organising comments