Refactor

- added some todo
- renaming refactor