added refactor TODO items