tidy up and style