Simplify order code logic
Bump version