Updated todo
Refactoring