Cleanup
Fix order again