Save bonus calculation

and clear comments