Whitespace police
Redundant modifiers
unused code and a impl fix