Tidy up of Style