Rearranging to be easier to read