Whitespace cleanup

Props @ocean90. See #17 and f7979d033