|#1157|+Rahul J| refactoring, code cleanup in calculation service