Updating TODO and fixing spacing issues