Minor tidies; thanks to Sublime whitespace cleanup magic