prep inputs for new format; pep8