fix remaining linter warnings

For some of the TODO: blah --> TODO(Joris): blah I made my best guess.
Feel free to change if you don't feel responsible