refactored calculateBonus methods
Merge pull request #39 from TomaQ/36_refactor_calculateBonus_methods

refactored calculateBonus methods