Refactoring to prepare for more bonuses