Streamlined the structure of the calculators' classes

Moved the calculators' getter methods directly into the calculators' classes obviating the need for the "result" objects and thus removing the unnecessary doubling of the constructors