removed calculator.py, updated calculator.feature, calculator.py