Added more refactoring notes