Update calculator steps and class