feedback refactoring