Simplify and distill

I haven't looked at this code for a couple months, I don't see why it needed to
be the way it was, making it simpler going forward seems the best thing to do.