Remove nesting to improve readability