Changed internal function calls to follow Pep8 guidelines.