Whitespace cleanup

Clean up code to pass cpplint for tabs, spaces and so on
Fix lint error

Mark constructor explicit so it doesn't get used as a type conversion
(which it definitely isn't suitable for!)