Hell lot of refactoring
Merge pull request #22 from yashunsky/wp/refactoring/19

Hell lot of refactoring