Make some of this more readable