reverted public/private views, pep8ify.