Refactor
Add TODO notes