Reorder declarations for consistency