Refactor and Simplify ProductValueNorm to be more readable