UPDATE cal and range, COSMITS: pep8 compliant