Removed TODOs. Added comments