MOD: refactor closure regex