Notes refactored