Cleaned up TODO list
Added line break before heading
Removed TODOs
Removed TODO