Some tidy up on the styles