Cleaning code
Fix indent
Fix indent
Refactoring C++ part