[ENHANCE] code improvement