beautify and change data

Signed-off-by: RyanZhu <troyzx1024@gmail.com>