Fixed TODOs in code