Cleanup some ordering