Quick tidy up, again