move normalisation stages to separate classes