Improve whitespace to match conventions