Refactor the optimizer