refactoring/added normalizers

see issue #117