Reorder for better readability