Actually final tidying this time!

Sorry, didn't check it carefully enough yesterday.