rename _inner functions, pep8 spacing