Cleaned up interface and trace ordering