+ TODOs, + Small refactorings