styling and tidy up a bit