Calculator: uses the correct classes
Merge pull request #568 from duckduckgo/mintsoft/calc_style_fixes

Calculator: uses the correct classes