Cleanup code to meet C++ standards
Add class stubs