Fix cpplint warnings