improved the ordering of the operators