new config style,   pep8 cleanup