Cleanup ordering
## ordering