[TASK] Refactor normalize methods to new abstract class