split out normalisation to separate module