Fixed pep warnings