reorder for better logging output