C++lize
More c++lize
rearange order
All add loop->