Refactoring based on feedback