Tidy up of styling