Clean and tidy a bit out of the way