Whitespace and license-header tidy-ups