Reorder the definition order for clarity