Tidied up bonus handling