Refactoring normalize function
Merge pull request #21 from yashunsky/wp/refactoring/17

Refactoring normalize function