Added normalize
Refactoring
Refactoring continue