tidy up a few style changes