Minor reordering for OCD sake