Clean up class + param order consistency