many more cpplint fixes