Little reorder to make things easier to read