Fixed Pep issues