Reduced nesting & simplified