notes, refactoring