Refactor the normalizers to increase accuracy and minimise the use of pattern (#4)

12 files changed