optimize the data storage format

Signed-off-by: Haley <B51762@freescale.com>