Cleanup and order