Updated optimizer to reflect changes

Just realized the operator precedence is all mucked up