Refactor: Isolate closing brace before else