Even more refactoring
Merge pull request #23 from yashunsky/wp/refactoring/20

Even more refactoring