Partner Code Refactoring