Tidy up styling a bit more