Rearranging things for readability