Issue #28: pep8 compliance
Issue #24: Ensure C++ files conform to astyle formatting