Fix dodgy formatting and whitespace