Get rid of unnecessary constants
Merge pull request #9 from yashunsky/wp/refactoring/7

Get rid of unnecessary constants