Rearange a few things for readability.