Clearing some pep8 warnings