Minor C++ improvements
Fixes for clang
Fix font clearing
remove commented lines
Don't mix declarations and code
Merge pull request #3691 from mdboom/more-cpp-cleanup

Minor C++ improvements