consumer.py minor structure changes