comment review and tidying