- cpp code cleanup