Improve use of whitespace in code