Remove the named tuples and just use Python datastructures