tidy up more