Refactoring
End of day
Fixed bonus bug