Making less nesting