Tidy up some whitespace