Cleanup of PR, minimise whitespace diffs etc