Tidy up of initial refactor

Removed debug console.logs. Adjusted calibration element values.