iComments and tidying