Refactoring notes