Removed formatting errors. Updated TODO.