[task] change structure, add normalize