refactored calculator
Merge pull request #20 from ehunter-usgs/EQH-2191

refactored calculator