traits, tidy up