Tidies up, comments