removed TODO from corrected code