Refactoring and Calibrating