Completed refactoring of Q.normalize