Level and Bonus refactored