Retrofit refactoring