Little refactor to encapsulate normalizing terms