Improved style - mostly whitespace