Removed resolved TODO
Added comment