Bonus refactored