Minor refactoring
Merge pull request #24 from yashunsky/wp/refactoring/21

Minor refactoring