Removed old TODO
Formatted and cleaned up