Code review: 168330043:  Fix a whole lot of linter errors, spelling mistakes and unused imports. Also a bug or two.