Whitespace and tidy-up