Ack for C01 and C02

Some cleanup in main