Rework normalize algo