refactor - move normalize as model