+ Remove some unused using
+ Remove useless std::move
+ Reduce duplicate code
+ Avoid some copy

Change-Id: I7bdbc14aa1b79ce10d30f2f1ef005dd8839de62a