Make some of the logic easier to read