[Trivial] Some improve.