Tidy up things!