removed unused calculation functions
convert attributes to Bonuses
rename Bonuses to Modifier