removed pubsub namedtuple / pep8