more cpplint fixes