- clean up the code
- prepare data model for Notes