refactored all calculations
refactored all calculations
refactored all calculations
Merge pull request #6 from travis6888/develop

leaned and cleaned views