style and tidy up