improve some trivial place