Fixed pmd issues in Calculations.