added TODO and other notes into refactor