Pedantic whitespace cleanup