Refactor

- Minor refactoring and indentation.
- Added To-Do.