[REQS-420] Corrections following PR comments. Clean the calculator code with private internal methods.
[REQS-420] Changed back to original formatting.