Refactoring Notes