diff --git a/asterix-bad/src/main/resources/lang-extension/lang.txt b/asterix-bad/src/main/resources/lang-extension/lang.txt
index 7456cef..58240fd 100644
--- a/asterix-bad/src/main/resources/lang-extension/lang.txt
+++ b/asterix-bad/src/main/resources/lang-extension/lang.txt
@@ -82,7 +82,7 @@
       }
               | "broker" pairId = QualifiedName() ifExists = IfExists()
       {
-        stmt = new BrokerDropStatement(pairId.first, pairId.second, ifExists);	
+        stmt = new BrokerDropStatement(pairId.first, pairId.second, ifExists);
       }
               | "procedure" funcSig = FunctionSignature() ifExists = IfExists()
       {
@@ -244,10 +244,7 @@
    }
    | "unsubscribe" id = StringLiteral() <FROM> nameComponents = QualifiedName()
       {
-        VariableExpr varExp = new VariableExpr();
-        VarIdentifier var = new VarIdentifier();
-        varExp.setVar(var);
-        var.setValue("$subscriptionPlaceholder");
+        VariableExpr varExp = new VariableExpr(new VarIdentifier("$subscriptionPlaceholder"));
         getCurrentScope().addNewVarSymbolToScope(varExp.getVar());
         stmt = new ChannelUnsubscribeStatement(varExp, nameComponents.first, nameComponents.second, id, getVarCounter());
       }