Modified to pass cpplint.