cleaned up the namedtuple call