Update step: Correct bad syntax and bad design