Refactoring references