+ improve c++ style
+ formatting