association refactoring