Move data normalization from helper to concern. Refs #1978