Updated for cpplint