Refactoring

Removed TODOs and some comments.