Reorder for minor efficiency gain