code refine. this also resolve 4 issues in HandlebarsTest