Tidying comments