Fixed pep issues