Removed TODO and fixed comment