Notes
Refactoring