Config class is oldstyle, plus style fixes