Tidy up more