RF - PR feedback and pep8 cleanup