tidy up formatting & look