Fix normalizing version
Improve normalized output