Rearranging things for consistency