settings infr pep8
settings infrastr, further cleanup