Cleanup
Fix "base class should be explicitly initialized in the copy constructor" warnings
Fix "suggest a space before ';' or explicit braces around empty body in 'while' statement" warning