+ fix method signature
+ c++ style : formatting