Clean up some minor ugliness, and move the order of columns to the _constants file