Fix CppLint warnings