Fixed leftover TODOs
Merge pull request #70 from danielkutik/code-style

Fixed TODOs of code-style pull request