Caixa refactor and data normalization