1st part of refactoring to our cpp-Style