Refactor all the things.  Reads much nicer, now.