Tidying up, comments