Pep8
Merge pull request #32 from yashunsky/wp/refactoring/24

Pep8