Get rid of normalize parameter

We judge whether to normalize or not by the variable type