code review
- added TODO itens