Added cpp, refactoring