Moved TODOs into file
Refactoring