Fixed TODOs of code-style pull request

Just finishing this off :)