Fix cpplint errors