Updated calc.py

Had a code review with Guy. I made some adjustments based on his input.