Tidy up of formatting