a bit of user tidy up