Refactoring and Bonuses