Update format and content

Signed-off-by: Tu Do <tu.h.do@dektech.com.au>