Comments and tidying