diff --git a/.gitignore b/.gitignore
index 4a4272142..45bb7f5d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ target/
 .ipynb_checkpoints/
 *.iml
 /bin/
-*.jar
+rumble*.jar
 *.*~
 
 # for now ignore jsound package
diff --git a/src/main/java/org/rumbledb/expressions/primary/InlineFunctionExpression.java b/src/main/java/org/rumbledb/expressions/primary/InlineFunctionExpression.java
index 95f05b526..399082c07 100644
--- a/src/main/java/org/rumbledb/expressions/primary/InlineFunctionExpression.java
+++ b/src/main/java/org/rumbledb/expressions/primary/InlineFunctionExpression.java
@@ -138,7 +138,7 @@ public StatementsAndOptionalExpr getBody() {
 
     @Nullable
     public List<Annotation> getAnnotations() {
-        return annotations;
+        return this.annotations;
     }
 
     @Override
@@ -252,7 +252,7 @@ public void serializeToJSONiq(StringBuffer sb, int indent) {
     }
 
     public boolean hasSequentialPropertyAnnotation() {
-        return hasSequentialPropertyAnnotation;
+        return this.hasSequentialPropertyAnnotation;
     }
 
     public void setHasExitStatement(boolean hasExitStatement) {
diff --git a/src/main/java/org/rumbledb/expressions/scripting/block/BlockStatement.java b/src/main/java/org/rumbledb/expressions/scripting/block/BlockStatement.java
index 075209262..281bc1989 100644
--- a/src/main/java/org/rumbledb/expressions/scripting/block/BlockStatement.java
+++ b/src/main/java/org/rumbledb/expressions/scripting/block/BlockStatement.java
@@ -27,7 +27,7 @@ public <T> T accept(AbstractNodeVisitor<T> visitor, T argument) {
     @Override
     public List<Node> getChildren() {
         List<Node> result = new ArrayList<>();
-        blockStatements.forEach(statement -> {
+        this.blockStatements.forEach(statement -> {
             if (statement != null) {
                 result.add(statement);
             }
@@ -49,6 +49,6 @@ public void serializeToJSONiq(StringBuffer sb, int indent) {
     }
 
     public List<Statement> getBlockStatements() {
-        return blockStatements;
+        return this.blockStatements;
     }
 }
diff --git a/src/main/java/org/rumbledb/expressions/scripting/control/SwitchStatement.java b/src/main/java/org/rumbledb/expressions/scripting/control/SwitchStatement.java
index a19182d91..f6bc43efc 100644
--- a/src/main/java/org/rumbledb/expressions/scripting/control/SwitchStatement.java
+++ b/src/main/java/org/rumbledb/expressions/scripting/control/SwitchStatement.java
@@ -74,14 +74,14 @@ public void serializeToJSONiq(StringBuffer sb, int indent) {
     }
 
     public Expression getTestCondition() {
-        return testCondition;
+        return this.testCondition;
     }
 
     public List<SwitchCaseStatement> getCases() {
-        return cases;
+        return this.cases;
     }
 
     public Statement getDefaultStatement() {
-        return defaultStatement;
+        return this.defaultStatement;
     }
 }
diff --git a/src/main/java/org/rumbledb/expressions/scripting/loops/ExitStatement.java b/src/main/java/org/rumbledb/expressions/scripting/loops/ExitStatement.java
index abe9f8a28..eec89443d 100644
--- a/src/main/java/org/rumbledb/expressions/scripting/loops/ExitStatement.java
+++ b/src/main/java/org/rumbledb/expressions/scripting/loops/ExitStatement.java
@@ -34,7 +34,7 @@ public void serializeToJSONiq(StringBuffer sb, int indent) {
     }
 
     public Expression getExitExpression() {
-        return exitExpression;
+        return this.exitExpression;
     }
 
 }