Cleanup of nested if-lets