refactoring notes