Simpler, better.

Kinda missed the point of a namedtuple there.