From 85ead49aac71002b5a2d9791ab6340ea1de53de9 Mon Sep 17 00:00:00 2001
From: Dominik Helm <helm@cs.tu-darmstadt.de>
Date: Mon, 22 Jan 2024 17:34:39 +0100
Subject: [PATCH 1/6] Remove outdated formatting configs

---
 Scalariform Formatter Preferences.properties |  29 -----
 scalastyle-config.xml                        | 120 -------------------
 2 files changed, 149 deletions(-)
 delete mode 100644 Scalariform Formatter Preferences.properties
 delete mode 100644 scalastyle-config.xml

diff --git a/Scalariform Formatter Preferences.properties b/Scalariform Formatter Preferences.properties
deleted file mode 100644
index ce1efacdb4..0000000000
--- a/Scalariform Formatter Preferences.properties	
+++ /dev/null
@@ -1,29 +0,0 @@
-#Scalariform formatter preferences
-#Fri Aug 01 16:36:46 CEST 2014
-alignArguments=false
-alignParameters=true
-formatXml=true
-preserveDanglingCloseParenthesis=true
-danglingCloseParenthesis=force
-spaceInsideBrackets=false
-indentWithTabs=false
-spaceInsideParentheses=false
-multilineScaladocCommentsStartOnFirstLine=false
-alignSingleLineCaseStatements=true
-compactStringConcatenation=false
-placeScaladocAsterisksBeneathSecondAsterisk=false
-indentPackageBlocks=true
-doubleIndentConstructorArguments=true
-compactControlReadability=false
-spacesWithinPatternBinders=true
-spacesAroundMultiImports=false
-alignSingleLineCaseStatements.maxArrowIndent=50
-doubleIndentClassDeclaration=true
-preserveSpaceBeforeArguments=false
-spaceBeforeColon=false
-# Unicode arrows are not supported anymore since Scala 2.13
-rewriteArrowSymbols=false
-indentLocalDefs=false
-indentSpaces=4
-firstArgumentOnNewline=force
-firstParameterOnNewline=force
diff --git a/scalastyle-config.xml b/scalastyle-config.xml
deleted file mode 100644
index 604f24a237..0000000000
--- a/scalastyle-config.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scalastyle>
-  <name>Scalastyle OPAL Configuration</name>
-  <!-- CANDIDATES -->
-  <check level="error" class="org.scalastyle.scalariform.PublicMethodsHaveTypeChecker" enabled="false"/>
-  <check level="error" class="org.scalastyle.file.NewLineAtEofChecker" enabled="false"/>
-  <check level="error" class="org.scalastyle.scalariform.IfBraceChecker" enabled="false">
-    <parameters>
-      <parameter name="singleLineAllowed"><![CDATA[true]]></parameter>
-      <parameter name="doubleLineAllowed"><![CDATA[false]]></parameter>
-    </parameters>
-  </check>
-  <check level="error" class="org.scalastyle.scalariform.MagicNumberChecker" enabled="false">
-    <parameters>
-      <parameter name="ignore"><![CDATA[-1,0,1,2,3]]></parameter>
-    </parameters>
-  </check>
-  <check enabled="false" class="org.scalastyle.scalariform.BlockImportChecker" level="error"/>
-  <check enabled="false" class="org.scalastyle.scalariform.ImportOrderChecker" level="error">
-    <parameters>
-      <parameter name="groups">scala_lang,java,scala,others,opalj</parameter>
-      <parameter name="group.scala_lang">scala\.language\..+</parameter>
-      <parameter name="group.java">javax?\..+</parameter>
-      <parameter name="group.scala">scala\..+</parameter>
-      <parameter name="group.others">^(org.opalj).+</parameter>
-      <parameter name="group.others">org.opalj\..+</parameter>
-    </parameters>
-  </check>  
-  <!-- ENABLED CHECKERS -->  
-  <check level="error" class="org.scalastyle.file.FileTabChecker" enabled="true"/>
-  <check level="error" class="org.scalastyle.file.HeaderMatchesChecker" enabled="true">
-    <parameters>
-      <parameter name="header"><![CDATA[/* BSD 2-Clause License - see OPAL/LICENSE for details. */]]></parameter>
-    </parameters>
-  </check>
-  <check enabled="true" class="org.scalastyle.scalariform.EmptyClassChecker" level="error"/>
-  <check level="error" class="org.scalastyle.scalariform.NoWhitespaceBeforeLeftBracketChecker" enabled="true"/>
-  <check level="error" class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker" enabled="true"/>
-  <check level="error" class="org.scalastyle.scalariform.UppercaseLChecker" enabled="true"/>
-  <check level="error" class="org.scalastyle.scalariform.SimplifyBooleanExpressionChecker" enabled="true"/>  
-  <!-- DISABLED CHECKERS -->    
-  <check level="error" class="org.scalastyle.scalariform.CovariantEqualsChecker" enabled="false"/>
-  <check level="error" class="org.scalastyle.scalariform.SpacesAfterPlusChecker" enabled="false"/>
-  <check level="error" class="org.scalastyle.file.WhitespaceEndOfLineChecker" enabled="false"/>
-  <check level="error" class="org.scalastyle.scalariform.SpacesBeforePlusChecker" enabled="false"/>
-  <check level="error" class="org.scalastyle.file.FileLineLengthChecker" enabled="false">
-    <parameters>
-      <parameter name="maxLineLength"><![CDATA[100]]></parameter>
-      <parameter name="tabSize"><![CDATA[4]]></parameter>
-    </parameters>
-  </check>
-  <check level="error" class="org.scalastyle.scalariform.ClassNamesChecker" enabled="false">
-    <parameters>
-      <parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter>
-    </parameters>
-  </check>
-  <check level="error" class="org.scalastyle.scalariform.ObjectNamesChecker" enabled="false">
-    <parameters>
-      <parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter>
-    </parameters>
-  </check>
-  <check level="error" class="org.scalastyle.scalariform.PackageObjectNamesChecker" enabled="false">
-    <parameters>
-      <parameter name="regex"><![CDATA[^[a-z][A-Za-z]*$]]></parameter>
-    </parameters>
-  </check>
-  <check level="error" class="org.scalastyle.scalariform.EqualsHashCodeChecker" enabled="false"/>
-  <check level="error" class="org.scalastyle.scalariform.IllegalImportsChecker" enabled="false">
-    <parameters>
-      <parameter name="illegalImports"><![CDATA[sun._,java.awt._]]></parameter>
-    </parameters>
-  </check>
-  <check level="error" class="org.scalastyle.scalariform.ParameterNumberChecker" enabled="false">
-    <parameters>
-      <parameter name="maxParameters"><![CDATA[8]]></parameter>
-    </parameters>
-  </check>
-  <check level="error" class="org.scalastyle.scalariform.ReturnChecker" enabled="false"/>
-  <check level="error" class="org.scalastyle.scalariform.NullChecker" enabled="false"/>
-  <check level="error" class="org.scalastyle.scalariform.NoCloneChecker" enabled="false"/>
-  <check level="error" class="org.scalastyle.scalariform.NoFinalizeChecker" enabled="false"/>
-  <check level="error" class="org.scalastyle.scalariform.StructuralTypeChecker" enabled="false"/>
-  <check level="error" class="org.scalastyle.file.RegexChecker" enabled="false">
-    <parameters>
-      <parameter name="regex"><![CDATA[println]]></parameter>
-    </parameters>
-  </check>
-  <check level="error" class="org.scalastyle.scalariform.NumberOfTypesChecker" enabled="false">
-    <parameters>
-      <parameter name="maxTypes"><![CDATA[30]]></parameter>
-    </parameters>
-  </check>
-  <check level="error" class="org.scalastyle.scalariform.CyclomaticComplexityChecker" enabled="false">
-    <parameters>
-      <parameter name="maximum"><![CDATA[10]]></parameter>
-    </parameters>
-  </check>
-  <check level="error" class="org.scalastyle.scalariform.MethodLengthChecker" enabled="false">
-    <parameters>
-      <parameter name="maxLength"><![CDATA[50]]></parameter>
-    </parameters>
-  </check>
-  <check level="error" class="org.scalastyle.scalariform.MethodNamesChecker" enabled="false">
-    <parameters>
-      <parameter name="regex"><![CDATA[^[a-z][A-Za-z0-9]*$]]></parameter>
-    </parameters>
-  </check>
-  <check level="error" class="org.scalastyle.scalariform.NumberOfMethodsInTypeChecker" enabled="false">
-    <parameters>
-      <parameter name="maxMethods"><![CDATA[30]]></parameter>
-    </parameters>
-  </check>
-  <check level="error" class="org.scalastyle.file.NoNewLineAtEofChecker" enabled="false"/>
-  <check level="error" class="org.scalastyle.file.FileLengthChecker" enabled="false">
-    <parameters>
-      <parameter name="maxFileLength"><![CDATA[800]]></parameter>
-    </parameters>
-  </check>
-  
-</scalastyle>

From 746153324da1964fcd0b746b7a52d180417032c1 Mon Sep 17 00:00:00 2001
From: Dominik Helm <helm@cs.tu-darmstadt.de>
Date: Mon, 22 Jan 2024 17:34:55 +0100
Subject: [PATCH 2/6] Small adaptations to IDE formatter preferences

---
 Eclipse Java Formatter Preferences.xml        |  2 +-
 ...J Java and Scala Formatter Preferences.xml | 32 ++++++++-----------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/Eclipse Java Formatter Preferences.xml b/Eclipse Java Formatter Preferences.xml
index 10c113db61..3618e2b857 100644
--- a/Eclipse Java Formatter Preferences.xml	
+++ b/Eclipse Java Formatter Preferences.xml	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <profiles version="12">
-<profile kind="CodeFormatterProfile" name="Java Conventions [maximum line width 90]" version="12">
+<profile kind="CodeFormatterProfile" name="Java Conventions [maximum line width 120]" version="12">
 <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
diff --git a/IntelliJ Java and Scala Formatter Preferences.xml b/IntelliJ Java and Scala Formatter Preferences.xml
index ddd8a217fd..6afedd35a8 100644
--- a/IntelliJ Java and Scala Formatter Preferences.xml	
+++ b/IntelliJ Java and Scala Formatter Preferences.xml	
@@ -1,5 +1,5 @@
-<code_scheme name="Java Conventions [maximum line width 100]" version="173">
-  <option name="RIGHT_MARGIN" value="100" />
+<code_scheme name="Java Conventions [maximum line width 120]" version="173">
+  <option name="RIGHT_MARGIN" value="120" />
   <option name="FORMATTER_TAGS_ENABLED" value="true" />
   <JavaCodeStyleSettings>
     <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
@@ -18,24 +18,18 @@
         <option value="_______ blank line _______" />
         <option value="scala" />
         <option value="_______ blank line _______" />
-        <option value="all other imports" />
+        <option value="org.junit" />
+        <option value="org.scalacheck" />
+        <option value="org.scalatest" />
+        <option value="org.scalatestplus" />
+        <option value="_______ blank line _______" />
+        <option value="com.typesafe.config" />
+        <option value="_______ blank line _______" />
+        <option value="org.opalj" />
         <option value="_______ blank line _______" />
-        <option value="org.opalj.log" />
-        <option value="org.opalj.util" />
-        <option value="org.opalj.collection" />
-        <option value="org.opalj.concurrent" />
-        <option value="org.opalj.fpcf" />
-        <option value="org.opalj.bytecode" />
-        <option value="org.opalj.value" />
-        <option value="org.opalj.bi" />
-        <option value="org.opalj.da" />
-        <option value="org.opalj.br" />
-        <option value="org.opalj.bc" />
-        <option value="org.opalj.ba" />
-        <option value="org.opalj.ai" />
-        <option value="org.opalj.tac" />
-        <option value="org.opalj.de" />
-        <option value="org.opalj.av" />
+        <option value="scala.collection.parallel.CollectionConverters" />
+        <option value="_______ blank line _______" />
+        <option value="all other imports" />
       </array>
     </option>
     <option name="importShortestPathForAmbiguousReferences" value="false" />

From c27e171693a68aea0173f4ac81f04488719bd3c4 Mon Sep 17 00:00:00 2001
From: Dominik Helm <helm@cs.tu-darmstadt.de>
Date: Mon, 22 Jan 2024 17:35:07 +0100
Subject: [PATCH 3/6] Remove double indent on constructors

---
 .scalafmt.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.scalafmt.conf b/.scalafmt.conf
index e47971ae55..26602c2a45 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -12,7 +12,6 @@ docstrings {
 indent {
   main = 4
   callSite = 4
-  ctorSite = 8 # Double Indent
 }
 indentOperator.exemptScope = aloneEnclosed
 

From 980865ede21dd7163ae9df273a765a29b8627c21 Mon Sep 17 00:00:00 2001
From: Dominik Helm <helm@cs.tu-darmstadt.de>
Date: Mon, 22 Jan 2024 17:36:44 +0100
Subject: [PATCH 4/6] Reformat

---
 .../scala/org/opalj/ai/ExceptionUsage.scala   |   8 +-
 .../l1/MethodReturnValuesAnalysis.scala       |   6 +-
 .../base/IdentifyResourcesAnalysis.scala      |   4 +-
 .../ex1/IdentifyResourcesAnalysis.scala       |   4 +-
 .../org/opalj/support/debug/XHTMLTracer.scala |  10 +-
 .../scala/org/opalj/fpcf/PropertiesTest.scala |   6 +-
 .../AllocationFreenessMatcher.scala           |   2 +-
 .../CompileTimeConstancyMatcher.scala         |   2 +-
 .../escape/EscapePropertyMatcher.scala        |   2 +-
 .../types/TypeImmutabilityMatcher.scala       |   2 +-
 .../opalj/ai/domain/RecordDefUseTest.scala    |   8 +-
 OPAL/ai/src/main/scala/org/opalj/ai/AI.scala  |   4 +-
 .../main/scala/org/opalj/ai/AIException.scala |   8 +-
 .../src/main/scala/org/opalj/ai/BaseAI.scala  |   4 +-
 .../org/opalj/ai/BoundedInterruptableAI.scala |  20 +--
 .../main/scala/org/opalj/ai/Computation.scala |   6 +-
 .../opalj/ai/InstructionCountBoundedAI.scala  |  10 +-
 .../scala/org/opalj/ai/TimeBoundedAI.scala    |   2 +-
 .../org/opalj/ai/common/DomainRegistry.scala  |   4 +-
 .../ai/domain/ImpossibleRefinement.scala      |   4 +-
 .../opalj/ai/domain/ReifiedConstraints.scala  |  14 +-
 .../org/opalj/ai/domain/l0/BaseDomain.scala   |   8 +-
 .../l0/DefaultReferenceValuesBinding.scala    |   2 +-
 .../ai/domain/l0/PrimitiveTACAIDomain.scala   |   4 +-
 .../ai/domain/l0/TypeCheckingDomain.scala     |  14 +-
 .../domain/l1/DefaultArrayValuesBinding.scala |   8 +-
 .../domain/l1/DefaultClassValuesBinding.scala |   6 +-
 .../DefaultConcreteArrayValuesBinding.scala   |   8 +-
 .../opalj/ai/domain/l1/DefaultDomain.scala    |  12 +-
 .../l1/DefaultIntervalValuesDomain.scala      |   4 +-
 .../l1/DefaultReferenceValuesBinding.scala    |  28 ++--
 .../l1/DefaultReferenceValuesDomain.scala     |   8 +-
 .../ai/domain/l1/DefaultSetValuesDomain.scala |   4 +-
 .../l1/DefaultSingletonValuesDomain.scala     |   4 +-
 .../l1/DefaultStringValuesBinding.scala       |   6 +-
 .../opalj/ai/domain/l1/ReferenceValues.scala  |  14 +-
 .../ai/domain/l1/StringBuilderValues.scala    |   8 +-
 .../domain/l2/CoordinatingValuesDomain.scala  |   2 +-
 .../opalj/ai/domain/l2/DefaultDomain.scala    |  20 +--
 .../l2/DefaultPerformInvocationsDomain.scala  |  12 +-
 .../ai/domain/l2/SharedValuesDomain.scala     |   4 +-
 .../fpcf/analyses/LBFieldValuesAnalysis.scala |  12 +-
 .../LBMethodReturnValuesAnalysis.scala        |   8 +-
 ...thCFGAndDefUseAndSignatureRefinement.scala |   6 +-
 ...veTACAIDomainWithSignatureRefinement.scala |   6 +-
 .../fpcf/properties/AIDomainFactoryKey.scala  |   6 +-
 .../org/opalj/collection/mutable/Locals.scala |  60 ++++-----
 .../scala/org/opalj/issues/FieldValues.scala  |   4 +-
 .../main/scala/org/opalj/issues/Issue.scala   |  14 +-
 .../org/opalj/issues/IssueLocation.scala      |  50 +++----
 .../org/opalj/issues/LocalVariables.scala     |   6 +-
 .../org/opalj/issues/MethodReturnValues.scala |   4 +-
 .../scala/org/opalj/issues/Operands.scala     |   8 +-
 .../ConstraintsBetweenIntegerValuesTest.scala |   2 +-
 .../domain/l1/DefaultConcreteArraysTest.scala |   2 +-
 .../domain/l1/DefaultIntegerRangesTest.scala  |   4 +-
 .../ai/domain/l1/DefaultIntegerSetsTest.scala |   2 +-
 .../ai/domain/l1/DefaultLongSetsTest.scala    |   2 +-
 .../ai/domain/l2/PerformInvocationsTest.scala |   8 +-
 ...nvocationsWithRecursionDetectionTest.scala |  16 +--
 .../scala/org/opalj/apk/ApkComponent.scala    |   8 +-
 .../apk/ApkContextRegisteredReceiver.scala    |  10 +-
 .../org/opalj/apk/parser/ApkParser.scala      |   4 +-
 .../av/checking/AnnotationPredicate.scala     |   4 +-
 .../av/checking/AnnotationsPredicate.scala    |   6 +-
 .../org/opalj/av/checking/ClassMatcher.scala  |  14 +-
 .../org/opalj/av/checking/FieldMatcher.scala  |   8 +-
 .../org/opalj/av/checking/MethodMatcher.scala |   6 +-
 .../opalj/av/checking/MethodPredicate.scala   |   4 +-
 .../opalj/av/checking/PackageMatcher.scala    |   4 +-
 .../av/checking/SourceElementPredicate.scala  |   4 +-
 .../org/opalj/av/checking/Specification.scala |  42 +++---
 .../av/checking/SpecificationViolation.scala  |  22 ++--
 .../src/main/scala/org/opalj/ba/CLASS.scala   |  16 +--
 .../org/opalj/ba/CodeAttributeBuilder.scala   |  16 +--
 .../ba/ExceptionHandlerConfiguration.scala    |  10 +-
 .../opalj/ba/ExceptionHandlerElement.scala    |   6 +-
 .../src/main/scala/org/opalj/ba/FIELD.scala   |   8 +-
 .../org/opalj/ba/InstructionLikeElement.scala |   6 +-
 .../main/scala/org/opalj/ba/LabeledCode.scala |   4 +-
 .../src/main/scala/org/opalj/ba/METHOD.scala  |  10 +-
 .../opalj/ba/ProjectBasedClassLoader.scala    |   4 +-
 .../main/scala/org/opalj/ba/ToDAConfig.scala  |   4 +-
 .../org/opalj/bi/AccessFlagsIterator.scala    |   4 +-
 .../main/scala/org/opalj/br/Annotation.scala  |   4 +-
 .../scala/org/opalj/br/BootstrapMethod.scala  |   4 +-
 .../main/scala/org/opalj/br/ClassFile.scala   |  16 +--
 .../scala/org/opalj/br/ClassHierarchy.scala   |  66 +++++-----
 .../br/src/main/scala/org/opalj/br/Code.scala |  10 +-
 .../br/CodeAnalysisFailedException.scala      |   6 +-
 .../org/opalj/br/ConstantFieldValue.scala     |   2 +-
 .../scala/org/opalj/br/DeclaredField.scala    |  12 +-
 .../scala/org/opalj/br/DeclaredMethod.scala   |  20 +--
 .../scala/org/opalj/br/DynamicConstant.scala  |   6 +-
 .../scala/org/opalj/br/EnclosingMethod.scala  |   6 +-
 .../scala/org/opalj/br/ExceptionHandler.scala |   8 +-
 .../src/main/scala/org/opalj/br/Field.scala   |  18 +--
 .../scala/org/opalj/br/InnerClassTable.scala  |   8 +-
 .../scala/org/opalj/br/LocalVariable.scala    |  10 +-
 .../org/opalj/br/LocalVariableTypeTable.scala |  10 +-
 .../src/main/scala/org/opalj/br/Method.scala  |  22 ++--
 .../scala/org/opalj/br/MethodDescriptor.scala |  14 +-
 .../scala/org/opalj/br/MethodHandle.scala     |  56 ++++----
 .../scala/org/opalj/br/MethodParameter.scala  |   4 +-
 .../scala/org/opalj/br/MethodSignature.scala  |   4 +-
 .../src/main/scala/org/opalj/br/Module.scala  |  16 +--
 .../scala/org/opalj/br/RecordComponent.scala  |   6 +-
 ...imeInvisibleParameterAnnotationTable.scala |   2 +-
 .../RuntimeInvisibleTypeAnnotationTable.scala |   2 +-
 ...ntimeVisibleParameterAnnotationTable.scala |   2 +-
 .../RuntimeVisibleTypeAnnotationTable.scala   |   2 +-
 .../main/scala/org/opalj/br/Signature.scala   |  36 +++---
 .../scala/org/opalj/br/StackMapFrame.scala    |  20 +--
 .../org/opalj/br/StructureIdentifier.scala    |  10 +-
 .../org/opalj/br/SynthesizedClassFiles.scala  |   2 +-
 .../br/src/main/scala/org/opalj/br/Type.scala |   8 +-
 .../scala/org/opalj/br/TypeAnnotation.scala   |  48 +++----
 .../scala/org/opalj/br/TypeDeclaration.scala  |   8 +-
 .../org/opalj/br/VirtualSourceElement.scala   |  20 +--
 .../opalj/br/analyses/AnalysisException.scala |   4 +-
 .../opalj/br/analyses/DeclaredFields.scala    |  14 +-
 .../opalj/br/analyses/DeclaredMethods.scala   |  14 +-
 .../br/analyses/DeclaredMethodsKey.scala      |  24 ++--
 .../InconsistentProjectException.scala        |   4 +-
 .../scala/org/opalj/br/analyses/Project.scala |  78 +++++------
 .../org/opalj/br/analyses/ProjectIndex.scala  |   4 +-
 .../analyses/VirtualFormalParametersKey.scala |   2 +-
 .../br/analyses/cg/CallBySignatureKey.scala   |   2 +-
 .../br/analyses/cg/EntryPointFinder.scala     |   6 +-
 .../cg/IsOverridableMethodAnalysis.scala      |   6 +-
 .../scala/org/opalj/br/cfg/BasicBlock.scala   |   4 +-
 .../src/main/scala/org/opalj/br/cfg/CFG.scala |  10 +-
 .../scala/org/opalj/br/cfg/CatchNode.scala    |  10 +-
 .../br/collection/immutable/TypesSet.scala    |   4 +-
 .../opalj/br/cp/CONSTANT_Dynamic_info.scala   |   4 +-
 .../opalj/br/cp/CONSTANT_Fieldref_info.scala  |   4 +-
 .../cp/CONSTANT_InterfaceMethodref_info.scala |   4 +-
 .../br/cp/CONSTANT_InvokeDynamic_info.scala   |   4 +-
 .../br/cp/CONSTANT_MethodHandle_info.scala    |   4 +-
 .../br/cp/CONSTANT_MethodType_info.scala      |   2 +-
 .../opalj/br/cp/CONSTANT_Methodref_info.scala |   4 +-
 .../br/cp/CONSTANT_NameAndType_info.scala     |   4 +-
 .../opalj/br/cp/CONSTANT_String_info.scala    |   2 +-
 .../org/opalj/br/cp/ConstantsBuffer.scala     |   4 +-
 .../scala/org/opalj/br/cp/ConstantsPool.scala |   4 +-
 .../br/fpcf/analyses/ConfiguredPurity.scala   |  14 +-
 .../L0AllocationFreenessAnalysis.scala        |   2 +-
 .../L0SelfReferenceLeakageAnalysis.scala      |   4 +-
 .../analyses/L1ThrownExceptionsAnalysis.scala |   2 +-
 ...tualMethodAllocationFreenessAnalysis.scala |   2 +-
 ...VirtualMethodStaticDataUsageAnalysis.scala |   2 +-
 ...irtualMethodThrownExceptionsAnalysis.scala |   2 +-
 .../VirtualReturnValueFreshnessAnalysis.scala |   2 +-
 .../opalj/br/fpcf/properties/Context.scala    |   6 +-
 .../br/fpcf/properties/MethodComplexity.scala |   2 +-
 .../br/fpcf/properties/ThrownExceptions.scala |   2 +-
 .../ThrownExceptionsByOverridingMethods.scala |   2 +-
 .../VirtualMethodAllocationFreeness.scala     |   2 +-
 .../VirtualMethodEscapeProperty.scala         |   2 +-
 .../fpcf/properties/VirtualMethodPurity.scala |   2 +-
 .../VirtualMethodStaticDataUsage.scala        |   2 +-
 .../opalj/br/fpcf/properties/cg/Callees.scala |  10 +-
 .../opalj/br/fpcf/properties/cg/Callers.scala |  10 +-
 .../fpcf/properties/cg/ForNameClasses.scala   |   4 +-
 .../properties/cg/InstantiatedTypes.scala     |   4 +-
 .../br/fpcf/properties/cg/LoadedClasses.scala |   4 +-
 .../fieldaccess/FieldAccessInformation.scala  |  20 +--
 .../MethodFieldAccessInformation.scala        |  24 ++--
 .../pointsto/AllocationSitePointsToSet.scala  |  10 +-
 .../pointsto/TypeBasedPointsToSet.scala       |   4 +-
 .../BranchoffsetOutOfBoundsException.scala    |   2 +-
 .../org/opalj/br/instructions/CHECKCAST.scala |   2 +-
 .../org/opalj/br/instructions/GETFIELD.scala  |   6 +-
 .../org/opalj/br/instructions/GETSTATIC.scala |   6 +-
 .../org/opalj/br/instructions/GOTO.scala      |   2 +-
 .../org/opalj/br/instructions/GOTO_W.scala    |   2 +-
 .../org/opalj/br/instructions/IFEQ.scala      |   2 +-
 .../org/opalj/br/instructions/IFGE.scala      |   2 +-
 .../org/opalj/br/instructions/IFGT.scala      |   2 +-
 .../org/opalj/br/instructions/IFLE.scala      |   2 +-
 .../org/opalj/br/instructions/IFLT.scala      |   2 +-
 .../org/opalj/br/instructions/IFNE.scala      |   2 +-
 .../org/opalj/br/instructions/IFNONNULL.scala |   2 +-
 .../org/opalj/br/instructions/IFNULL.scala    |   2 +-
 .../org/opalj/br/instructions/IF_ACMPEQ.scala |   2 +-
 .../org/opalj/br/instructions/IF_ACMPNE.scala |   2 +-
 .../org/opalj/br/instructions/IF_ICMPEQ.scala |   2 +-
 .../org/opalj/br/instructions/IF_ICMPGE.scala |   2 +-
 .../org/opalj/br/instructions/IF_ICMPGT.scala |   2 +-
 .../org/opalj/br/instructions/IF_ICMPLE.scala |   2 +-
 .../org/opalj/br/instructions/IF_ICMPLT.scala |   2 +-
 .../org/opalj/br/instructions/IF_ICMPNE.scala |   2 +-
 .../opalj/br/instructions/INSTANCEOF.scala    |   2 +-
 .../opalj/br/instructions/INVOKEDYNAMIC.scala |   6 +-
 .../br/instructions/INVOKEINTERFACE.scala     |   6 +-
 .../opalj/br/instructions/INVOKESPECIAL.scala |   8 +-
 .../opalj/br/instructions/INVOKESTATIC.scala  |   8 +-
 .../opalj/br/instructions/INVOKEVIRTUAL.scala |   6 +-
 .../scala/org/opalj/br/instructions/JSR.scala |   2 +-
 .../org/opalj/br/instructions/JSR_W.scala     |   2 +-
 .../scala/org/opalj/br/instructions/LDC.scala |   6 +-
 .../org/opalj/br/instructions/LDC2_W.scala    |   6 +-
 .../org/opalj/br/instructions/LDC_W.scala     |   6 +-
 .../opalj/br/instructions/LOOKUPSWITCH.scala  |   8 +-
 .../br/instructions/MULTIANEWARRAY.scala      |   4 +-
 .../org/opalj/br/instructions/PUTFIELD.scala  |   6 +-
 .../org/opalj/br/instructions/PUTSTATIC.scala |   6 +-
 .../scala/org/opalj/br/instructions/RET.scala |   2 +-
 .../opalj/br/instructions/TABLESWITCH.scala   |  16 +--
 .../reader/Java11FrameworkWithCaching.scala   |   2 +-
 ...meworkWithDynamicRewritingAndCaching.scala |   2 +-
 .../reader/Java16FrameworkWithCaching.scala   |   2 +-
 ...meworkWithDynamicRewritingAndCaching.scala |   2 +-
 .../reader/Java17FrameworkWithCaching.scala   |   2 +-
 ...meworkWithDynamicRewritingAndCaching.scala |   2 +-
 .../br/reader/Java8FrameworkWithCaching.scala |   2 +-
 ...rkWithInvokedynamicSupportAndCaching.scala |   2 +-
 .../br/reader/Java9FrameworkWithCaching.scala |   2 +-
 ...rkWithInvokedynamicSupportAndCaching.scala |   2 +-
 .../org/opalj/value/ValueInformation.scala    |  40 +++---
 .../collection/immutable/IdentityPair.scala   |   4 +-
 .../opalj/collection/immutable/Int2List.scala |   6 +-
 .../collection/immutable/IntArraySet.scala    |  10 +-
 .../opalj/collection/immutable/IntList.scala  |   4 +-
 .../collection/immutable/IntTrieSet.scala     |  24 ++--
 .../collection/immutable/Long2List.scala      |  28 ++--
 .../immutable/LongLinkedTrieSet.scala         |  78 +++++------
 .../opalj/collection/immutable/LongList.scala |   4 +-
 .../collection/immutable/LongTrieSet.scala    | 100 +++++++-------
 .../immutable/LongTrieSetWithList.scala       |  18 +--
 .../opalj/collection/immutable/Ref2List.scala |   6 +-
 .../opalj/collection/immutable/UIDSet.scala   |  10 +-
 .../collection/immutable/UIDTrieSet.scala     |  28 ++--
 .../collection/mutable/FixedSizeBitSet.scala  |   2 +-
 .../mutable/FixedSizedHashIDMap.scala         |   6 +-
 .../collection/mutable/IntArrayStack.scala    |   4 +-
 .../opalj/collection/mutable/IntQueue.scala   |   4 +-
 .../collection/mutable/RefAccumulator.scala   |   2 +-
 .../concurrent/OPALThreadPoolExecutor.scala   |   4 +-
 .../scala/org/opalj/concurrent/Tasks.scala    |  14 +-
 .../IncompatibleNumericConstraints.scala      |  14 +-
 .../opalj/constraints/ValueConstraints.scala  |  16 +--
 .../org/opalj/graphs/DefaultMutableNode.scala |  14 +-
 .../org/opalj/graphs/DominanceFrontiers.scala |   2 +-
 .../org/opalj/graphs/DominatorTree.scala      |   8 +-
 .../main/scala/org/opalj/graphs/Graph.scala   |   6 +-
 .../org/opalj/graphs/MutableNodeLike.scala    |   8 +-
 .../org/opalj/graphs/PostDominatorTree.scala  |  10 +-
 .../opalj/graphs/UnidirectionalGraph.scala    |   4 +-
 .../graphs/VirtualUnidirectionalGraph.scala   |   4 +-
 .../io/FailAfterByteArrayOutputStream.scala   |   4 +-
 .../opalj/io/OpeningFileFailedException.scala |   4 +-
 .../org/opalj/log/ExceptionLogMessage.scala   |   8 +-
 .../org/opalj/log/StandardLogMessage.scala    |   6 +-
 .../org/opalj/util/InMemoryClassLoader.scala  |   4 +-
 .../main/scala/org/opalj/da/Annotation.scala  |   4 +-
 .../da/AnnotationDefault_attribute.scala      |   4 +-
 .../opalj/da/BootstrapMethods_attribute.scala |   4 +-
 .../org/opalj/da/CONSTANT_Dynamic_info.scala  |   4 +-
 .../org/opalj/da/CONSTANT_Fieldref_info.scala |   4 +-
 .../da/CONSTANT_InterfaceMethodref_info.scala |   4 +-
 .../da/CONSTANT_InvokeDynamic_info.scala      |   4 +-
 .../opalj/da/CONSTANT_MethodHandle_info.scala |   4 +-
 .../opalj/da/CONSTANT_MethodType_info.scala   |   2 +-
 .../opalj/da/CONSTANT_Methodref_info.scala    |   4 +-
 .../opalj/da/CONSTANT_NameAndType_info.scala  |   4 +-
 .../main/scala/org/opalj/da/ClassFile.scala   |  20 +--
 .../scala/org/opalj/da/Code_attribute.scala   |  12 +-
 .../opalj/da/ConstantValue_attribute.scala    |   4 +-
 .../scala/org/opalj/da/ElementValue.scala     |   4 +-
 .../scala/org/opalj/da/ElementValuePair.scala |   4 +-
 .../opalj/da/EnclosingMethod_attribute.scala  |   6 +-
 .../org/opalj/da/ExceptionTableEntry.scala    |   8 +-
 .../org/opalj/da/Exceptions_attribute.scala   |   4 +-
 .../main/scala/org/opalj/da/Field_Info.scala  |   8 +-
 .../org/opalj/da/InnerClassesEntry.scala      |   8 +-
 .../org/opalj/da/InnerClasses_attribute.scala |   4 +-
 .../org/opalj/da/LineNumberTableEntry.scala   |   4 +-
 .../opalj/da/LineNumberTable_attribute.scala  |   4 +-
 .../opalj/da/LocalVariableTableEntry.scala    |  10 +-
 .../da/LocalVariableTable_attribute.scala     |   4 +-
 .../da/LocalVariableTypeTableEntry.scala      |  10 +-
 .../da/LocalVariableTypeTable_attribute.scala |   4 +-
 .../opalj/da/MethodParameters_attribute.scala |   8 +-
 .../main/scala/org/opalj/da/Method_Info.scala |   8 +-
 .../opalj/da/ModuleMainClass_attribute.scala  |   4 +-
 .../opalj/da/ModulePackages_attribute.scala   |   4 +-
 .../scala/org/opalj/da/Module_attribute.scala |  40 +++---
 .../org/opalj/da/NestHost_attribute.scala     |   4 +-
 .../org/opalj/da/NestMembers_attribute.scala  |   4 +-
 .../da/PermittedSubclasses_attribute.scala    |   4 +-
 .../scala/org/opalj/da/Record_attribute.scala |  10 +-
 ...untimeInvisibleAnnotations_attribute.scala |   4 +-
 ...isibleParameterAnnotations_attribute.scala |   4 +-
 ...meInvisibleTypeAnnotations_attribute.scala |   4 +-
 .../RuntimeVisibleAnnotations_attribute.scala |   4 +-
 ...isibleParameterAnnotations_attribute.scala |   4 +-
 ...timeVisibleTypeAnnotations_attribute.scala |   4 +-
 .../org/opalj/da/Signature_attribute.scala    |   4 +-
 .../da/SourceDebugExtension_attribute.scala   |   4 +-
 .../org/opalj/da/SourceFile_attribute.scala   |   4 +-
 .../scala/org/opalj/da/StackMapFrame.scala    |  24 ++--
 .../opalj/da/StackMapTable_attribute.scala    |   4 +-
 .../scala/org/opalj/da/TypeAnnotation.scala   |   8 +-
 .../org/opalj/da/TypeAnnotationPath.scala     |   2 +-
 .../org/opalj/da/TypeAnnotationTarget.scala   |  28 ++--
 .../main/scala/org/opalj/da/TypeInfo.scala    |   6 +-
 .../org/opalj/da/Unknown_attribute.scala      |   4 +-
 ...endencyCollectingDependencyProcessor.scala |   2 +-
 .../de/DependencyProcessorDecorator.scala     |   2 +-
 .../scala/org/opalj/de/DependencyStore.scala  |   6 +-
 .../scala/org/opalj/ifds/IFDSAnalysis.scala   |  34 ++---
 .../fpcf/ContextNotAvailableException.scala   |   4 +-
 .../main/scala/org/opalj/fpcf/EOptionP.scala  |  18 +--
 .../scala/org/opalj/fpcf/EOptionPSet.scala    |   4 +-
 .../org/opalj/fpcf/PhaseConfiguration.scala   |   4 +-
 .../fpcf/PropertyComputationResult.scala      |  22 ++--
 .../fpcf/PropertyKindsConfiguration.scala     |   8 +-
 .../main/scala/org/opalj/fpcf/Schedule.scala  |   4 +-
 .../opalj/fpcf/par/PKECPropertyStore.scala    |  40 +++---
 .../opalj/fpcf/par/PropertyStoreTracer.scala  | 104 +++++++--------
 .../fpcf/seq/PKESequentialPropertyStore.scala |   8 +-
 .../org/opalj/fpcf/seq/QualifiedTask.scala    |  22 ++--
 .../org/opalj/fpcf/seq/TasksManager.scala     |  18 +--
 .../PropertyComputationsSchedulerTest.scala   |  12 +-
 .../org/opalj/fpcf/PropertyStoreTest.scala    |   4 +-
 .../scala/org/opalj/fpcf/fixtures/Node.scala  |   4 +-
 .../PropertyStoreConfigurationRecorder.scala  |   2 +-
 .../src/main/scala/org/opalj/tac/DUVar.scala  |  10 +-
 .../src/main/scala/org/opalj/tac/Expr.scala   | 108 ++++++++--------
 .../main/scala/org/opalj/tac/Parameters.scala |   2 +-
 .../src/main/scala/org/opalj/tac/Stmt.scala   | 110 ++++++++--------
 .../scala/org/opalj/tac/TACOptimization.scala |   4 +-
 .../main/scala/org/opalj/tac/TACStmts.scala   |   2 +-
 .../src/main/scala/org/opalj/tac/TACode.scala |  20 +--
 .../analyses/ConfiguredMethodsHelper.scala    |  20 +--
 .../analyses/FieldImmutabilityAnalysis.scala  |  12 +-
 .../fpcf/analyses/FieldLocalityAnalysis.scala |   8 +-
 .../SystemPropertiesAnalysisScheduler.scala   |   2 +-
 .../opalj/tac/fpcf/analyses/cg/CGState.scala  |   4 +-
 .../fpcf/analyses/cg/CallGraphAnalysis.scala  |   2 +-
 .../analyses/cg/CallGraphDeserializer.scala   |  12 +-
 .../opalj/tac/fpcf/analyses/cg/CallSite.scala |   8 +-
 ...iguredNativeMethodsCallGraphAnalysis.scala |   2 +-
 .../analyses/cg/DoPrivilegedCGAnalysis.scala  |   8 +-
 .../analyses/cg/LoadedClassesAnalysis.scala   |   2 +-
 .../SerializationRelatedCallsAnalysis.scala   |   6 +-
 .../cg/StaticInitializerAnalysis.scala        |   8 +-
 .../cg/ThreadRelatedCallsAnalysis.scala       |  10 +-
 .../tac/fpcf/analyses/cg/TypeIterator.scala   |   4 +-
 .../cg/reflection/MethodMatcher.scala         |   6 +-
 .../ReflectionRelatedCallsAnalysis.scala      |  28 ++--
 .../TamiFlexCallGraphAnalysis.scala           |   8 +-
 ...tiveMethodsInstantiatedTypesAnalysis.scala |   2 +-
 .../cg/rta/InstantiatedTypesAnalysis.scala    |   2 +-
 .../cg/xta/ArrayInstantiationsAnalysis.scala  |   6 +-
 .../cg/xta/InstantiatedTypesAnalysis.scala    |   6 +-
 ...ntiatedTypesBasedEntryPointsAnalysis.scala |   2 +-
 .../cg/xta/TypePropagationAnalysis.scala      |   6 +-
 .../cg/xta/TypePropagationState.scala         |  14 +-
 .../InterProceduralEscapeAnalysis.scala       |  16 +--
 .../escape/ReturnValueFreshnessAnalysis.scala |   2 +-
 .../escape/SimpleEscapeAnalysis.scala         |  12 +-
 .../FieldAccessInformationAnalysis.scala      |   4 +-
 .../fieldaccess/reflection/FieldMatcher.scala |   4 +-
 ...flectionRelatedFieldAccessesAnalysis.scala | 122 +++++++++---------
 .../L2FieldAssignabilityAnalysis.scala        |   2 +-
 .../fpcf/analyses/ifds/JavaIFDSProblem.scala  |   8 +-
 .../AllocationSiteBasedPointsToAnalysis.scala |   2 +-
 .../pointsto/ArraycopyPointsToAnalysis.scala  |   2 +-
 .../ConfiguredMethodsPointsToAnalysis.scala   |   2 +-
 .../pointsto/NewInstanceAnalysis.scala        |   6 +-
 .../pointsto/PointsToAnalysisState.scala      |   4 +-
 .../ReflectionAllocationsAnalysis.scala       |   6 +-
 .../SerializationAllocationsAnalysis.scala    |   2 +-
 .../fpcf/analyses/pointsto/TamiFlexKey.scala  |  24 ++--
 .../pointsto/TamiFlexPointsToAnalysis.scala   |  42 +++---
 .../pointsto/TypeBasedPointsToAnalysis.scala  |   2 +-
 .../pointsto/UnsafePointsToAnalysis.scala     |  12 +-
 .../analyses/purity/L1PurityAnalysis.scala    |  14 +-
 .../analyses/purity/L2PurityAnalysis.scala    |  12 +-
 .../org/opalj/tac/fpcf/properties/TACAI.scala |   2 +-
 .../org/opalj/tac/fpcf/properties/Taint.scala |   4 +-
 .../hermes/DuplicateFeatureIDException.scala  |   6 +-
 .../main/scala/org/opalj/hermes/Feature.scala |   6 +-
 .../scala/org/opalj/hermes/FeatureQuery.scala |   4 +-
 .../scala/org/opalj/hermes/Location.scala     |  20 +--
 .../opalj/hermes/ProjectConfiguration.scala   |   8 +-
 .../org/opalj/hermes/ProjectFeatures.scala    |   4 +-
 .../opalj/hermes/ProjectInstantiation.scala   |   4 +-
 .../opalj/hermes/queries/FanInFanOut.scala    |   8 +-
 .../queries/jcg/Java8Invokedynamics.scala     |   2 +-
 .../hermes/queries/util/APIFeature.scala      |  16 +--
 393 files changed, 1896 insertions(+), 1896 deletions(-)

diff --git a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/ExceptionUsage.scala b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/ExceptionUsage.scala
index 5b5fc4159f..626a85c20b 100644
--- a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/ExceptionUsage.scala
+++ b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/ExceptionUsage.scala
@@ -145,10 +145,10 @@ object ExceptionUsage extends ProjectAnalysisApplication {
 }
 
 case class ExceptionUsage(
-        method:           Method,
-        definitionSite:   PC,
-        exceptionType:    String,
-        usageInformation: scala.collection.Set[UsageKind.Value]
+    method:           Method,
+    definitionSite:   PC,
+    exceptionType:    String,
+    usageInformation: scala.collection.Set[UsageKind.Value]
 ) extends scala.math.Ordered[ExceptionUsage] {
 
     override def toString: String = {
diff --git a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/domain/l1/MethodReturnValuesAnalysis.scala b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/domain/l1/MethodReturnValuesAnalysis.scala
index d5a2225c21..96e1a143d4 100644
--- a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/domain/l1/MethodReturnValuesAnalysis.scala
+++ b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/domain/l1/MethodReturnValuesAnalysis.scala
@@ -30,9 +30,9 @@ import scala.collection.parallel.CollectionConverters.IterableIsParallelizable
 object MethodReturnValuesAnalysis extends ProjectAnalysisApplication {
 
     class AnalysisDomain(
-            override val project: Project[java.net.URL],
-            val ai:               InterruptableAI[_],
-            val method:           Method
+        override val project: Project[java.net.URL],
+        val ai:               InterruptableAI[_],
+        val method:           Method
     ) extends CorrelationalDomain
         with domain.DefaultSpecialDomainValuesBinding
         with domain.ThrowAllPotentialExceptionsConfiguration
diff --git a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/base/IdentifyResourcesAnalysis.scala b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/base/IdentifyResourcesAnalysis.scala
index c6f1670a98..eda1eec961 100644
--- a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/base/IdentifyResourcesAnalysis.scala
+++ b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/base/IdentifyResourcesAnalysis.scala
@@ -58,8 +58,8 @@ object IdentifyResourcesAnalysis extends ProjectAnalysisApplication {
         // Perform a simple abstract interpretation to check if there is some
         // method that passes a constant string to a method.
         class AnalysisDomain(
-                override val project: Project[URL],
-                val method:           Method
+            override val project: Project[URL],
+            val method:           Method
         ) extends CorrelationalDomain
             with domain.TheProject
             with domain.TheMethod
diff --git a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/ex1/IdentifyResourcesAnalysis.scala b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/ex1/IdentifyResourcesAnalysis.scala
index 1fa6d83d91..f5e5a6bf71 100644
--- a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/ex1/IdentifyResourcesAnalysis.scala
+++ b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/ex1/IdentifyResourcesAnalysis.scala
@@ -24,8 +24,8 @@ import scala.collection.parallel.CollectionConverters.IterableIsParallelizable
 object IdentifyResourcesAnalysis extends ProjectAnalysisApplication {
 
     class AnalysisDomain(
-            override val project: Project[URL],
-            val method:           Method
+        override val project: Project[URL],
+        val method:           Method
     ) extends CorrelationalDomain
         with domain.DefaultSpecialDomainValuesBinding
         with domain.ThrowAllPotentialExceptionsConfiguration
diff --git a/DEVELOPING_OPAL/tools/src/main/scala/org/opalj/support/debug/XHTMLTracer.scala b/DEVELOPING_OPAL/tools/src/main/scala/org/opalj/support/debug/XHTMLTracer.scala
index b3bb76702c..d6d9429c0e 100644
--- a/DEVELOPING_OPAL/tools/src/main/scala/org/opalj/support/debug/XHTMLTracer.scala
+++ b/DEVELOPING_OPAL/tools/src/main/scala/org/opalj/support/debug/XHTMLTracer.scala
@@ -24,11 +24,11 @@ import org.opalj.collection.mutable.IntArrayStack
 import org.opalj.io.writeAndOpen
 
 case class FlowEntity(
-        pc:          Int,
-        instruction: Instruction,
-        operands:    Operands[_ >: Null <: Domain#DomainValue],
-        locals:      Locals[_ >: Null <: Domain#DomainValue],
-        properties:  Option[String]
+    pc:          Int,
+    instruction: Instruction,
+    operands:    Operands[_ >: Null <: Domain#DomainValue],
+    locals:      Locals[_ >: Null <: Domain#DomainValue],
+    properties:  Option[String]
 ) {
     val flowId = FlowEntity.nextFlowId
 }
diff --git a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/PropertiesTest.scala b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/PropertiesTest.scala
index f7cf2a2693..fef3b9b5d3 100644
--- a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/PropertiesTest.scala
+++ b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/PropertiesTest.scala
@@ -418,7 +418,7 @@ abstract class PropertiesTest extends AnyFunSpec with Matchers {
 }
 
 case class TestContext(
-        project:       Project[URL],
-        propertyStore: PropertyStore,
-        analyses:      List[FPCFAnalysis]
+    project:       Project[URL],
+    propertyStore: PropertyStore,
+    analyses:      List[FPCFAnalysis]
 )
diff --git a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/allocation_freeness/AllocationFreenessMatcher.scala b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/allocation_freeness/AllocationFreenessMatcher.scala
index 528bedf984..a48b9860e8 100644
--- a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/allocation_freeness/AllocationFreenessMatcher.scala
+++ b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/allocation_freeness/AllocationFreenessMatcher.scala
@@ -16,7 +16,7 @@ import org.opalj.br.fpcf.properties.AllocationFreeness
  * @author Dominik Helm
  */
 sealed abstract class AllocationFreenessMatcher(
-        val property: AllocationFreeness
+    val property: AllocationFreeness
 ) extends AbstractPropertyMatcher {
 
     def validateProperty(
diff --git a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/compile_time_constancy/CompileTimeConstancyMatcher.scala b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/compile_time_constancy/CompileTimeConstancyMatcher.scala
index c863fb5872..3fe25be717 100644
--- a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/compile_time_constancy/CompileTimeConstancyMatcher.scala
+++ b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/compile_time_constancy/CompileTimeConstancyMatcher.scala
@@ -17,7 +17,7 @@ import org.opalj.br.fpcf.properties.CompileTimeVaryingField
  * @author Dominik Helm
  */
 sealed abstract class CompileTimeConstancyMatcher(
-        val property: CompileTimeConstancy
+    val property: CompileTimeConstancy
 ) extends AbstractPropertyMatcher {
 
     def validateProperty(
diff --git a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/escape/EscapePropertyMatcher.scala b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/escape/EscapePropertyMatcher.scala
index 9959dee286..6aec57236d 100644
--- a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/escape/EscapePropertyMatcher.scala
+++ b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/escape/EscapePropertyMatcher.scala
@@ -23,7 +23,7 @@ import org.opalj.tac.common.DefinitionSite
  * @author Florian Kuebler
  */
 abstract class EscapePropertyMatcher(
-        val property: EscapeProperty
+    val property: EscapeProperty
 ) extends AbstractPropertyMatcher {
 
     override def isRelevant(
diff --git a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/immutability/types/TypeImmutabilityMatcher.scala b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/immutability/types/TypeImmutabilityMatcher.scala
index 91587f2bcd..43378650de 100644
--- a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/immutability/types/TypeImmutabilityMatcher.scala
+++ b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/immutability/types/TypeImmutabilityMatcher.scala
@@ -16,7 +16,7 @@ import org.opalj.fpcf.Property
 import org.opalj.fpcf.properties.AbstractPropertyMatcher
 
 class TypeImmutabilityMatcher(
-        val property: TypeImmutability
+    val property: TypeImmutability
 ) extends AbstractPropertyMatcher {
 
     import org.opalj.br.analyses.SomeProject
diff --git a/OPAL/ai/src/it/scala/org/opalj/ai/domain/RecordDefUseTest.scala b/OPAL/ai/src/it/scala/org/opalj/ai/domain/RecordDefUseTest.scala
index cc2f47ca09..a31f80227d 100644
--- a/OPAL/ai/src/it/scala/org/opalj/ai/domain/RecordDefUseTest.scala
+++ b/OPAL/ai/src/it/scala/org/opalj/ai/domain/RecordDefUseTest.scala
@@ -35,8 +35,8 @@ class RecordDefUseTest extends AnyFunSpec with Matchers {
     protected[this] object DominatorsPerformanceEvaluation extends PerformanceEvaluation
 
     protected[this] class DefUseDomain(
-            val method:  Method,
-            val project: Project[URL]
+        val method:  Method,
+        val project: Project[URL]
     ) extends CorrelationalDomain
         with TheProject
         with TheMethod
@@ -57,8 +57,8 @@ class RecordDefUseTest extends AnyFunSpec with Matchers {
         with RecordDefUse // <=== we are going to test!
 
     protected[this] class RefinedDefUseDomain(
-            method:  Method,
-            project: Project[URL]
+        method:  Method,
+        project: Project[URL]
     ) extends DefUseDomain(method, project)
         with RefineDefUseUsingOrigins // this should not really affect the results...
 
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/AI.scala b/OPAL/ai/src/main/scala/org/opalj/ai/AI.scala
index 98e53fc2c6..a0dd54ea2e 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/AI.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/AI.scala
@@ -134,8 +134,8 @@ import org.opalj.log.Warn
  * @author Michael Eichberg
  */
 abstract class AI[D <: Domain](
-        final val IdentifyDeadVariables:           Boolean = true,
-        final val RegisterStoreMayThrowExceptions: Boolean = false
+    final val IdentifyDeadVariables:           Boolean = true,
+    final val RegisterStoreMayThrowExceptions: Boolean = false
 ) {
 
     type SomeLocals[V <: d.DomainValue forSome { val d: D }] = Option[IndexedSeq[V]]
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/AIException.scala b/OPAL/ai/src/main/scala/org/opalj/ai/AIException.scala
index 0ca9e6cfc5..8f4e460a52 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/AIException.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/AIException.scala
@@ -12,8 +12,8 @@ package ai
  * @author Michael Eichberg
  */
 class AIException(
-        message:            String    = null,
-        cause:              Throwable = null,
-        enableSuppression:  Boolean   = false,
-        writableStackTrace: Boolean   = true
+    message:            String    = null,
+    cause:              Throwable = null,
+    enableSuppression:  Boolean   = false,
+    writableStackTrace: Boolean   = true
 ) extends RuntimeException(message, cause, enableSuppression, writableStackTrace)
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/BaseAI.scala b/OPAL/ai/src/main/scala/org/opalj/ai/BaseAI.scala
index 2d629cd902..c59758a9ec 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/BaseAI.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/BaseAI.scala
@@ -14,8 +14,8 @@ package ai
  * @author Michael Eichberg
  */
 class BaseAI(
-        IdentifyDeadVariables:           Boolean = true,
-        RegisterStoreMayThrowExceptions: Boolean = false
+    IdentifyDeadVariables:           Boolean = true,
+    RegisterStoreMayThrowExceptions: Boolean = false
 ) extends AI[Domain](IdentifyDeadVariables, RegisterStoreMayThrowExceptions) {
 
     override def isInterrupted: Boolean = Thread.interrupted()
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/BoundedInterruptableAI.scala b/OPAL/ai/src/main/scala/org/opalj/ai/BoundedInterruptableAI.scala
index cc3b0d53f2..4e42196c35 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/BoundedInterruptableAI.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/BoundedInterruptableAI.scala
@@ -25,22 +25,22 @@ import org.opalj.util.Nanoseconds
  * @author Michael Eichberg
  */
 class BoundedInterruptableAI[D <: Domain](
-        maxEvaluationCount:    Int,
-        val maxEvaluationTime: Nanoseconds,
-        val doInterrupt:       () => Boolean,
-        IdentifyDeadVariables: Boolean
+    maxEvaluationCount:    Int,
+    val maxEvaluationTime: Nanoseconds,
+    val doInterrupt:       () => Boolean,
+    IdentifyDeadVariables: Boolean
 ) extends InstructionCountBoundedAI[D](maxEvaluationCount, IdentifyDeadVariables) {
 
     private[this] var startTime: Long = -1L;
 
     def this(
-            code:                  Code,
-            maxEvaluationFactor:   Double,
-            maxEvaluationTime:     Milliseconds,
-            doInterrupt:           () => Boolean,
-            identifyDeadVariables: Boolean = true
+        code:                  Code,
+        maxEvaluationFactor:   Double,
+        maxEvaluationTime:     Milliseconds,
+        doInterrupt:           () => Boolean,
+        identifyDeadVariables: Boolean = true
     )(
-            implicit logContext: LogContext
+        implicit logContext: LogContext
     ) = {
         this(
             InstructionCountBoundedAI.calculateMaxEvaluationCount(code, maxEvaluationFactor),
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/Computation.scala b/OPAL/ai/src/main/scala/org/opalj/ai/Computation.scala
index bfd2ec1d64..0716c35580 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/Computation.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/Computation.scala
@@ -121,8 +121,8 @@ final case class ComputedValue[+V](result: V) extends Computation[V, Nothing] {
  * or threw an exception.
  */
 final case class ComputedValueOrException[+V, +E](
-        result:     V,
-        exceptions: E
+    result:     V,
+    exceptions: E
 ) extends Computation[V, E] {
 
     def returnsNormally: Boolean = true
@@ -169,7 +169,7 @@ final case class ThrowsException[+E](exceptions: E) extends Computation[Nothing,
  * did not return some value) or that threw an exception/multiple exceptions.
  */
 final case class ComputationWithSideEffectOrException[+E](
-        exceptions: E
+    exceptions: E
 ) extends Computation[Nothing, E] {
 
     def returnsNormally: Boolean = true
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/InstructionCountBoundedAI.scala b/OPAL/ai/src/main/scala/org/opalj/ai/InstructionCountBoundedAI.scala
index 9d4270471d..05571fc8e9 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/InstructionCountBoundedAI.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/InstructionCountBoundedAI.scala
@@ -25,8 +25,8 @@ import org.opalj.log.OPALLogger
  * @author Michael Eichberg
  */
 class InstructionCountBoundedAI[D <: Domain](
-        val maxEvaluationCount: Int,
-        IdentifyDeadVariables:  Boolean
+    val maxEvaluationCount: Int,
+    IdentifyDeadVariables:  Boolean
 ) extends AI[D](IdentifyDeadVariables) {
 
     /**
@@ -34,9 +34,9 @@ class InstructionCountBoundedAI[D <: Domain](
      *      before the evaluation of the method is automatically interrupted.
      */
     def this(
-            code:                  Code,
-            maxEvaluationFactor:   Double  = 1.5d,
-            identifyDeadVariables: Boolean = true
+        code:                  Code,
+        maxEvaluationFactor:   Double  = 1.5d,
+        identifyDeadVariables: Boolean = true
     )(implicit logContext: LogContext) = {
         this(
             InstructionCountBoundedAI.calculateMaxEvaluationCount(code, maxEvaluationFactor),
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/TimeBoundedAI.scala b/OPAL/ai/src/main/scala/org/opalj/ai/TimeBoundedAI.scala
index cf32e25dab..18df37b8b3 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/TimeBoundedAI.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/TimeBoundedAI.scala
@@ -15,7 +15,7 @@ import org.opalj.util.Nanoseconds
  * @author Michael Eichberg
  */
 class TimeBoundedAI[D <: Domain](
-        val maxEffort: Nanoseconds = new Milliseconds(150L).toNanoseconds
+    val maxEffort: Nanoseconds = new Milliseconds(150L).toNanoseconds
 ) extends AI[D] {
 
     private[this] final val CheckInterval = 100
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/common/DomainRegistry.scala b/OPAL/ai/src/main/scala/org/opalj/ai/common/DomainRegistry.scala
index f4eb75539e..54f983dd0a 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/common/DomainRegistry.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/common/DomainRegistry.scala
@@ -27,8 +27,8 @@ import org.opalj.br.analyses.SomeProject
 object DomainRegistry {
 
     case class DomainMetaInformation(
-            lessPreciseDomains: Set[Class[_ <: Domain]],
-            factory:            (SomeProject, Method) => Domain
+        lessPreciseDomains: Set[Class[_ <: Domain]],
+        factory:            (SomeProject, Method) => Domain
     )
 
     type ClassRegistry = Map[Class[_ <: Domain], DomainMetaInformation]
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/ImpossibleRefinement.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/ImpossibleRefinement.scala
index d525c89cb8..f8f515f208 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/ImpossibleRefinement.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/ImpossibleRefinement.scala
@@ -9,6 +9,6 @@ package domain
  * @author Michael Eichberg
  */
 case class ImpossibleRefinement(
-        value:          AnyRef,
-        refinementGoal: String
+    value:          AnyRef,
+    refinementGoal: String
 ) extends AIException(s"refining $value failed: $refinementGoal" /*,null, true, false*/ )
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/ReifiedConstraints.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/ReifiedConstraints.scala
index 6601734ca3..40a8b77962 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/ReifiedConstraints.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/ReifiedConstraints.scala
@@ -50,19 +50,19 @@ trait ReifiedConstraints extends IntegerValuesDomain with ReferenceValuesDomain
      * Representation of a constraint related to a single value.
      */
     case class ReifiedSingleValueConstraint(
-            pc:         Int,
-            value:      DomainValue,
-            constraint: String
+        pc:         Int,
+        value:      DomainValue,
+        constraint: String
     ) extends ReifiedConstraint
 
     /**
      * Representation of a constraint related to two values.
      */
     case class ReifiedTwoValuesConstraint(
-            pc:         Int,
-            value1:     DomainValue,
-            value2:     DomainValue,
-            constraint: String
+        pc:         Int,
+        value1:     DomainValue,
+        value2:     DomainValue,
+        constraint: String
     ) extends ReifiedConstraint
 
     abstract override def refEstablishIsNull(
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/BaseDomain.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/BaseDomain.scala
index 75ad9a1e84..280f0b0ec9 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/BaseDomain.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/BaseDomain.scala
@@ -19,8 +19,8 @@ import org.opalj.br.analyses.Project
  * @author Michael Eichberg
  */
 class BaseDomain[Source](
-        val project: Project[Source],
-        val method:  Method
+    val project: Project[Source],
+    val method:  Method
 ) extends TypeLevelDomain
     with ThrowAllPotentialExceptionsConfiguration
     with IgnoreSynchronization
@@ -47,6 +47,6 @@ object BaseDomain {
  * @tparam Source The source file's type.
  */
 class BaseDomainWithDefUse[Source](
-        project: Project[Source],
-        method:  Method
+    project: Project[Source],
+    method:  Method
 ) extends BaseDomain[Source](project, method) with RecordDefUse
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/DefaultReferenceValuesBinding.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/DefaultReferenceValuesBinding.scala
index 9d5c43ae11..a1af4f8738 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/DefaultReferenceValuesBinding.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/DefaultReferenceValuesBinding.scala
@@ -44,7 +44,7 @@ trait DefaultReferenceValuesBinding
     }
 
     protected case class DefaultMObjectValue(
-            upperTypeBound: UIDSet[ObjectType]
+        upperTypeBound: UIDSet[ObjectType]
     ) extends MObjectValueLike {
         override def isNull: Answer = Unknown
     }
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/PrimitiveTACAIDomain.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/PrimitiveTACAIDomain.scala
index dd55fddda2..5144d03b62 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/PrimitiveTACAIDomain.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/PrimitiveTACAIDomain.scala
@@ -14,8 +14,8 @@ import org.opalj.br.analyses.SomeProject
  * abstract interpretation.
  */
 class PrimitiveTACAIDomain(
-        val classHierarchy: ClassHierarchy,
-        val method:         Method
+    val classHierarchy: ClassHierarchy,
+    val method:         Method
 ) extends TypeLevelDomain
     with ThrowAllPotentialExceptionsConfiguration
     with IgnoreSynchronization
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/TypeCheckingDomain.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/TypeCheckingDomain.scala
index 9f63241fda..7533984f30 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/TypeCheckingDomain.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l0/TypeCheckingDomain.scala
@@ -25,8 +25,8 @@ import org.opalj.collection.immutable.UIDSet
  * invalid usage of an uninitialized object reference.)
  */
 final class TypeCheckingDomain(
-        val classHierarchy: ClassHierarchy,
-        val method:         Method
+    val classHierarchy: ClassHierarchy,
+    val method:         Method
 ) extends Domain
     with DefaultSpecialDomainValuesBinding
     with DefaultTypeLevelIntegerValues
@@ -67,7 +67,7 @@ final class TypeCheckingDomain(
     // -----------------------------------------------------------------------------------
 
     protected case class InitializedObjectValue(
-            override val theUpperTypeBound: ObjectType
+        override val theUpperTypeBound: ObjectType
     ) extends SObjectValueLike with Value {
         this: DomainObjectValue =>
 
@@ -86,8 +86,8 @@ final class TypeCheckingDomain(
      * @param origin The origin of the `new` instruction or -1 in case of "uninitialized this".
      */
     protected case class UninitializedObjectValue(
-            override val theUpperTypeBound: ObjectType,
-            origin:                         ValueOrigin
+        override val theUpperTypeBound: ObjectType,
+        origin:                         ValueOrigin
     ) extends SObjectValueLike {
         this: DomainObjectValue =>
 
@@ -161,13 +161,13 @@ final class TypeCheckingDomain(
     // --------------------------------------------------------------------------------------------
 
     protected case class DefaultMObjectValue(
-            upperTypeBound: UIDSet[ObjectType]
+        upperTypeBound: UIDSet[ObjectType]
     ) extends MObjectValueLike {
         override def isNull: Answer = Unknown
     }
 
     protected case class DefaultArrayValue(
-            theUpperTypeBound: ArrayType
+        theUpperTypeBound: ArrayType
     ) extends AnArrayValue {
         override def isNull: Answer = Unknown
     }
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultArrayValuesBinding.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultArrayValuesBinding.scala
index 7e5507080c..ed9f9af5d6 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultArrayValuesBinding.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultArrayValuesBinding.scala
@@ -22,10 +22,10 @@ trait DefaultArrayValuesBinding extends DefaultReferenceValuesBinding with Array
     //
 
     private case class DefaultInitializedArrayValue(
-            origin:            ValueOrigin,
-            theUpperTypeBound: ArrayType,
-            theLength:         Int,
-            refId:             RefId
+        origin:            ValueOrigin,
+        theUpperTypeBound: ArrayType,
+        theLength:         Int,
+        refId:             RefId
     ) extends InitializedArrayValue
 
     override def InitializedArrayValue(
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultClassValuesBinding.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultClassValuesBinding.scala
index 8e7f590ec0..d1a8c7c168 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultClassValuesBinding.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultClassValuesBinding.scala
@@ -22,9 +22,9 @@ trait DefaultClassValuesBinding extends DefaultStringValuesBinding with ClassVal
     //
 
     protected case class DefaultClassValue(
-            origin: ValueOrigin,
-            value:  Type,
-            refId:  RefId
+        origin: ValueOrigin,
+        value:  Type,
+        refId:  RefId
     ) extends ClassValue
 
     override def ClassValue(origin: ValueOrigin, value: Type): DomainClassValue = {
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultConcreteArrayValuesBinding.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultConcreteArrayValuesBinding.scala
index 7fa3a1876c..19eb1c5555 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultConcreteArrayValuesBinding.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultConcreteArrayValuesBinding.scala
@@ -24,10 +24,10 @@ trait DefaultConcreteArrayValuesBinding
     //
 
     private case class DefaultConcreteArrayValue(
-            origin:            ValueOrigin,
-            theUpperTypeBound: ArrayType,
-            values:            Array[DomainValue],
-            refId:             RefId
+        origin:            ValueOrigin,
+        theUpperTypeBound: ArrayType,
+        values:            Array[DomainValue],
+        refId:             RefId
     ) extends ConcreteArrayValue
 
     override def ArrayValue(
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultDomain.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultDomain.scala
index f2a19ca177..f1a025d11b 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultDomain.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultDomain.scala
@@ -13,8 +13,8 @@ import org.opalj.br.analyses.Project
  * @author Michael Eichberg
  */
 class DefaultDomain[Source](
-        val project: Project[Source],
-        val method:  Method
+    val project: Project[Source],
+    val method:  Method
 ) extends CorrelationalDomain
     with TheProject
     with TheMethod
@@ -45,8 +45,8 @@ class DefaultDomain[Source](
  * which also records the abstract-interpretation time control flow graph.
  */
 class DefaultDomainWithCFG[Source](
-        project: Project[Source],
-        method:  Method
+    project: Project[Source],
+    method:  Method
 ) extends DefaultDomain[Source](project, method) with RecordCFG
 
 /**
@@ -55,7 +55,7 @@ class DefaultDomainWithCFG[Source](
  * information.
  */
 class DefaultDomainWithCFGAndDefUse[Source](
-        project: Project[Source],
-        method:  Method
+    project: Project[Source],
+    method:  Method
 ) extends DefaultDomainWithCFG[Source](project, method)
     with RefineDefUseUsingOrigins
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultIntervalValuesDomain.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultIntervalValuesDomain.scala
index 980ba6a161..94e7eb32b7 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultIntervalValuesDomain.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultIntervalValuesDomain.scala
@@ -14,8 +14,8 @@ import org.opalj.br.analyses.Project
  * @author Michael Eichberg
  */
 class DefaultIntervalValuesDomain[Source](
-        val project: Project[Source],
-        val method:  Method
+    val project: Project[Source],
+    val method:  Method
 ) extends CorrelationalDomain
     with TheProject
     with TheMethod
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultReferenceValuesBinding.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultReferenceValuesBinding.scala
index b0ee85b39f..942fb8aa88 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultReferenceValuesBinding.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultReferenceValuesBinding.scala
@@ -44,26 +44,26 @@ trait DefaultReferenceValuesBinding extends l1.ReferenceValues with DefaultExcep
     //
 
     protected case class DefaultSObjectValue(
-            origin:                 ValueOrigin,
-            isNull:                 Answer,
-            override val isPrecise: Boolean,
-            theUpperTypeBound:      ObjectType,
-            refId:                  RefId
+        origin:                 ValueOrigin,
+        isNull:                 Answer,
+        override val isPrecise: Boolean,
+        theUpperTypeBound:      ObjectType,
+        refId:                  RefId
     ) extends SObjectValue
 
     protected case class DefaultMObjectValue(
-            origin:              ValueOrigin,
-            override val isNull: Answer,
-            upperTypeBound:      UIDSet[ObjectType],
-            refId:               RefId
+        origin:              ValueOrigin,
+        override val isNull: Answer,
+        upperTypeBound:      UIDSet[ObjectType],
+        refId:               RefId
     ) extends MObjectValue
 
     private case class DefaultArrayValue(
-            origin:                 ValueOrigin,
-            isNull:                 Answer,
-            override val isPrecise: Boolean,
-            theUpperTypeBound:      ArrayType,
-            refId:                  RefId
+        origin:                 ValueOrigin,
+        isNull:                 Answer,
+        override val isPrecise: Boolean,
+        theUpperTypeBound:      ArrayType,
+        refId:                  RefId
     ) extends ArrayValue
 
     override def NullValue(origin: ValueOrigin): DomainNullValue = new NullValue(origin)
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultReferenceValuesDomain.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultReferenceValuesDomain.scala
index a832d1c32f..a371fae8a4 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultReferenceValuesDomain.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultReferenceValuesDomain.scala
@@ -16,8 +16,8 @@ import org.opalj.br.analyses.Project
  * @author Michael Eichberg
  */
 class DefaultReferenceValuesDomain[Source](
-        val project: Project[Source],
-        val method:  Method
+    val project: Project[Source],
+    val method:  Method
 ) extends CorrelationalDomain
     with TheProject
     with TheMethod
@@ -37,7 +37,7 @@ class DefaultReferenceValuesDomain[Source](
     with l0.TypeLevelLongValuesShiftOperators
 
 class DefaultReferenceValuesDomainWithCFGAndDefUse[Source](
-        project: Project[Source],
-        method:  Method
+    project: Project[Source],
+    method:  Method
 ) extends DefaultReferenceValuesDomain(project, method)
     with RefineDefUseUsingOrigins
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultSetValuesDomain.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultSetValuesDomain.scala
index 6424b1d51b..65d1244722 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultSetValuesDomain.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultSetValuesDomain.scala
@@ -14,8 +14,8 @@ import org.opalj.br.analyses.Project
  * @author Michael Eichberg
  */
 class DefaultSetValuesDomain[Source](
-        val project: Project[Source],
-        val method:  Method
+    val project: Project[Source],
+    val method:  Method
 ) extends CorrelationalDomain
     with TheProject
     with TheMethod
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultSingletonValuesDomain.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultSingletonValuesDomain.scala
index a5ba5c3eb3..41edbc0d1d 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultSingletonValuesDomain.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultSingletonValuesDomain.scala
@@ -14,8 +14,8 @@ import org.opalj.br.analyses.Project
  * @author Michael Eichberg
  */
 class DefaultSingletonValuesDomain[Source](
-        val project: Project[Source],
-        val method:  Method
+    val project: Project[Source],
+    val method:  Method
 ) extends Domain
     with TypedValuesFactory
     with TheProject
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultStringValuesBinding.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultStringValuesBinding.scala
index cd16f57290..cd075708ad 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultStringValuesBinding.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/DefaultStringValuesBinding.scala
@@ -20,9 +20,9 @@ trait DefaultStringValuesBinding extends DefaultReferenceValuesBinding with Stri
     //
 
     protected case class DefaultStringValue(
-            origin: ValueOrigin,
-            value:  String,
-            refId:  RefId
+        origin: ValueOrigin,
+        value:  String,
+        refId:  RefId
     ) extends StringValue
 
     override def StringValue(
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/ReferenceValues.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/ReferenceValues.scala
index 6a9e0cda90..79134f67e8 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/ReferenceValues.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/ReferenceValues.scala
@@ -549,7 +549,7 @@ trait ReferenceValues extends l0.DefaultTypeLevelReferenceValues with Origin {
     }
 
     protected class NullValue(
-            override val origin: ValueOrigin
+        override val origin: ValueOrigin
     ) extends super.ANullValue with SingleOriginReferenceValue { this: DomainNullValue =>
 
         final def refId: RefId = domain.nullRefId
@@ -1052,12 +1052,12 @@ trait ReferenceValues extends l0.DefaultTypeLevelReferenceValues with Origin {
      *          types!
      */
     protected class MultipleReferenceValues(
-            val values:             UIDSet[DomainSingleOriginReferenceValue],
-            val origins:            ValueOrigins,
-            override val isNull:    Answer,
-            override val isPrecise: Boolean,
-            val upperTypeBound:     UIDSet[_ <: ReferenceType],
-            override val refId:     RefId
+        val values:             UIDSet[DomainSingleOriginReferenceValue],
+        val origins:            ValueOrigins,
+        override val isNull:    Answer,
+        override val isPrecise: Boolean,
+        val upperTypeBound:     UIDSet[_ <: ReferenceType],
+        override val refId:     RefId
     ) extends IsMultipleReferenceValue
         with TheReferenceValue
         with MultipleOriginsValue {
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/StringBuilderValues.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/StringBuilderValues.scala
index ea23ec42c7..809535e5aa 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/StringBuilderValues.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l1/StringBuilderValues.scala
@@ -43,10 +43,10 @@ trait StringBuilderValues extends StringValues {
 
     // TODO Move concrete class to DefaultBindingClass...
     protected class StringBuilderValue(
-            val origin:      ValueOrigin,
-            val builderType: ObjectType /*either StringBuilder oder StringBuffer*/,
-            val builder:     JStringBuilder,
-            val refId:       RefId
+        val origin:      ValueOrigin,
+        val builderType: ObjectType /*either StringBuilder oder StringBuffer*/,
+        val builder:     JStringBuilder,
+        val refId:       RefId
     ) extends SObjectValue {
         this: DomainStringValue =>
 
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/CoordinatingValuesDomain.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/CoordinatingValuesDomain.scala
index 513f53ca1c..0698bcd909 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/CoordinatingValuesDomain.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/CoordinatingValuesDomain.scala
@@ -10,6 +10,6 @@ import org.opalj.br.analyses.Project
  * A basic Domain that is used to identify recursive calls.
  */
 class CoordinatingValuesDomain[Source](
-        val project: Project[Source]
+    val project: Project[Source]
 ) extends ValuesCoordinatingDomain
     with SharedValuesDomain[Source]
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/DefaultDomain.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/DefaultDomain.scala
index cfa36ecaaa..13092d75a5 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/DefaultDomain.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/DefaultDomain.scala
@@ -8,10 +8,10 @@ import org.opalj.br.Method
 import org.opalj.br.analyses.Project
 
 class DefaultDomain[Source](
-        project:                            Project[Source],
-        method:                             Method,
-        val frequentEvaluationWarningLevel: Int,
-        val maxCallChainLength:             Int
+    project:                            Project[Source],
+    method:                             Method,
+    val frequentEvaluationWarningLevel: Int,
+    val maxCallChainLength:             Int
 ) extends SharedDefaultDomain[Source](project, method)
     with PerformInvocationsWithRecursionDetection
     with RecordCFG
@@ -56,12 +56,12 @@ class DefaultDomain[Source](
 }
 
 class ChildDefaultDomain[Source](
-        project: Project[Source],
-        method:  Method,
-        val callerDomain: PerformInvocationsWithRecursionDetection {
-            type CalledMethodDomain = ChildDefaultDomain[Source]
-        },
-        val maxCallChainLength: Int
+    project: Project[Source],
+    method:  Method,
+    val callerDomain: PerformInvocationsWithRecursionDetection {
+        type CalledMethodDomain = ChildDefaultDomain[Source]
+    },
+    val maxCallChainLength: Int
 ) extends SharedDefaultDomain[Source](project, method)
     with ChildPerformInvocationsWithRecursionDetection
     with DefaultRecordMethodCallResults { callingDomain =>
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/DefaultPerformInvocationsDomain.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/DefaultPerformInvocationsDomain.scala
index b8737a3332..f2b15faab3 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/DefaultPerformInvocationsDomain.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/DefaultPerformInvocationsDomain.scala
@@ -11,8 +11,8 @@ import org.opalj.br.analyses.Project
  * Performs a simple invocation of the immediately called methods.
  */
 class DefaultPerformInvocationsDomain[Source](
-        project: Project[Source],
-        method:  Method
+    project: Project[Source],
+    method:  Method
 ) extends SharedDefaultDomain[Source](project, method) with PerformInvocations {
 
     def shouldInvocationBePerformed(method: Method): Boolean = !method.returnType.isVoidType
@@ -28,13 +28,13 @@ class DefaultPerformInvocationsDomain[Source](
 }
 
 class DefaultPerformInvocationsDomainWithCFG[Source](
-        project: Project[Source],
-        method:  Method
+    project: Project[Source],
+    method:  Method
 ) extends DefaultPerformInvocationsDomain[Source](project, method)
     with RecordCFG
 
 class DefaultPerformInvocationsDomainWithCFGAndDefUse[Source](
-        project: Project[Source],
-        method:  Method
+    project: Project[Source],
+    method:  Method
 ) extends DefaultPerformInvocationsDomainWithCFG[Source](project, method)
     with RefineDefUseUsingOrigins
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/SharedValuesDomain.scala b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/SharedValuesDomain.scala
index b2a0154d6c..d6f781dd3f 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/SharedValuesDomain.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/domain/l2/SharedValuesDomain.scala
@@ -35,8 +35,8 @@ trait SharedValuesDomain[Source]
  * @author Michael Eichberg
  */
 class SharedDefaultDomain[Source](
-        val project: Project[Source],
-        val method:  Method
+    val project: Project[Source],
+    val method:  Method
 ) extends TheMethod
     with ThrowAllPotentialExceptionsConfiguration
     with IgnoreSynchronization
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/analyses/LBFieldValuesAnalysis.scala b/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/analyses/LBFieldValuesAnalysis.scala
index 7069b7f63f..9065339ee3 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/analyses/LBFieldValuesAnalysis.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/analyses/LBFieldValuesAnalysis.scala
@@ -103,7 +103,7 @@ import org.opalj.log.OPALLogger
  * @author Michael Eichberg
  */
 class LBFieldValuesAnalysis private[analyses] (
-        val project: SomeProject
+    val project: SomeProject
 ) extends FPCFAnalysis { analysis =>
 
     final val fieldAccessInformation = project.get(FieldAccessInformationKey)
@@ -148,8 +148,8 @@ class LBFieldValuesAnalysis private[analyses] (
      * @author Michael Eichberg
      */
     class FieldValuesAnalysisDomain private (
-            val classFile: ClassFile,
-            val dependees: EOptionPSet[Entity, Property]
+        val classFile: ClassFile,
+        val dependees: EOptionPSet[Entity, Property]
     ) extends CorrelationalDomain
         with domain.TheProject
         with domain.TheCode
@@ -183,9 +183,9 @@ class LBFieldValuesAnalysis private[analyses] (
         val calledMethods: mutable.Map[Method, mutable.Set[Method]] = mutable.Map.empty
 
         def this(
-                classFile:      ClassFile,
-                relevantFields: IterableOnce[Field],
-                dependees:      EOptionPSet[Entity, Property] = EOptionPSet.empty
+            classFile:      ClassFile,
+            relevantFields: IterableOnce[Field],
+            dependees:      EOptionPSet[Entity, Property] = EOptionPSet.empty
         ) = {
             this(classFile, dependees)
             fieldInformation = relevantFields.iterator.map[(Field, Option[DomainValue])](_ -> None).toMap
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/analyses/LBMethodReturnValuesAnalysis.scala b/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/analyses/LBMethodReturnValuesAnalysis.scala
index c5b4618ebf..fa0159d9b2 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/analyses/LBMethodReturnValuesAnalysis.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/analyses/LBMethodReturnValuesAnalysis.scala
@@ -38,7 +38,7 @@ import org.opalj.value.ValueInformation
  * @author Michael Eichberg
  */
 class LBMethodReturnValuesAnalysis private[analyses] (
-        val project: SomeProject
+    val project: SomeProject
 ) extends FPCFAnalysis { analysis =>
 
     /**
@@ -47,9 +47,9 @@ class LBMethodReturnValuesAnalysis private[analyses] (
      * @author Michael Eichberg
      */
     class MethodReturnValuesAnalysisDomain(
-            val ai:        InterruptableAI[MethodReturnValuesAnalysisDomain],
-            val method:    Method,
-            val dependees: EOptionPSet[Entity, Property]
+        val ai:        InterruptableAI[MethodReturnValuesAnalysisDomain],
+        val method:    Method,
+        val dependees: EOptionPSet[Entity, Property]
     ) extends CorrelationalDomain
         with domain.TheProject
         with domain.TheMethod
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/domain/L1DefaultDomainWithCFGAndDefUseAndSignatureRefinement.scala b/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/domain/L1DefaultDomainWithCFGAndDefUseAndSignatureRefinement.scala
index 1361689357..9392593658 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/domain/L1DefaultDomainWithCFGAndDefUseAndSignatureRefinement.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/domain/L1DefaultDomainWithCFGAndDefUseAndSignatureRefinement.scala
@@ -14,9 +14,9 @@ import org.opalj.fpcf.Property
 import org.opalj.fpcf.SinglePropertiesBoundType
 
 class L1DefaultDomainWithCFGAndDefUseAndSignatureRefinement[Source](
-        project:       Project[Source],
-        method:        Method,
-        val dependees: EOptionPSet[Entity, Property] = EOptionPSet.empty
+    project:       Project[Source],
+    method:        Method,
+    val dependees: EOptionPSet[Entity, Property] = EOptionPSet.empty
 ) extends DefaultDomainWithCFGAndDefUse[Source](project, method)
     with RefinedTypeLevelFieldAccessInstructions
     with RefinedTypeLevelInvokeInstructions {
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/domain/PrimitiveTACAIDomainWithSignatureRefinement.scala b/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/domain/PrimitiveTACAIDomainWithSignatureRefinement.scala
index be4a194565..22da9373f4 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/domain/PrimitiveTACAIDomainWithSignatureRefinement.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/domain/PrimitiveTACAIDomainWithSignatureRefinement.scala
@@ -24,9 +24,9 @@ import org.opalj.fpcf.SinglePropertiesBoundType
  * of a lightweight abstract interpretation.
  */
 class PrimitiveTACAIDomainWithSignatureRefinement(
-        val project:   SomeProject,
-        val method:    Method,
-        val dependees: EOptionPSet[Entity, Property] = EOptionPSet.empty
+    val project:   SomeProject,
+    val method:    Method,
+    val dependees: EOptionPSet[Entity, Property] = EOptionPSet.empty
 ) extends TypeLevelDomain
     with ThrowAllPotentialExceptionsConfiguration
     with IgnoreSynchronization
diff --git a/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/properties/AIDomainFactoryKey.scala b/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/properties/AIDomainFactoryKey.scala
index 17d45133d7..7c2d5e8e0a 100644
--- a/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/properties/AIDomainFactoryKey.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/ai/fpcf/properties/AIDomainFactoryKey.scala
@@ -16,9 +16,9 @@ import org.opalj.log.OPALLogger
  * for the specified project. This typically initialized by the [[AIDomainFactoryKey$]].
  */
 class ProjectSpecificAIExecutor(
-        val project:       SomeProject,
-        val domainClass:   Class[_ <: Domain],
-        val domainFactory: (SomeProject, Method) => Domain
+    val project:       SomeProject,
+    val domainClass:   Class[_ <: Domain],
+    val domainFactory: (SomeProject, Method) => Domain
 ) extends (Method => AIResult) {
 
     def apply(m: Method): AIResult = { BaseAI(m, domainFactory(project, m)) }
diff --git a/OPAL/ai/src/main/scala/org/opalj/collection/mutable/Locals.scala b/OPAL/ai/src/main/scala/org/opalj/collection/mutable/Locals.scala
index 085be1d08c..90919f6a17 100644
--- a/OPAL/ai/src/main/scala/org/opalj/collection/mutable/Locals.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/collection/mutable/Locals.scala
@@ -400,7 +400,7 @@ sealed abstract private[mutable] class LocalsX[T >: Null <: AnyRef] extends Loca
 }
 
 private[mutable] final class Locals1[T >: Null <: AnyRef](
-        private var v: T = null
+    private var v: T = null
 ) extends LocalsX[T] {
 
     override final def size: Int = 1
@@ -484,8 +484,8 @@ private[mutable] final class Locals1[T >: Null <: AnyRef](
 }
 
 private[mutable] final class Locals2[T >: Null <: AnyRef](
-        private var v0: T = null,
-        private var v1: T = null
+    private var v0: T = null,
+    private var v1: T = null
 ) extends LocalsX[T] {
 
     override final def size: Int = 2
@@ -600,9 +600,9 @@ private[mutable] final class Locals2[T >: Null <: AnyRef](
 }
 
 private[mutable] final class Locals3[T >: Null <: AnyRef](
-        private var v0: T = null,
-        private var v1: T = null,
-        private var v2: T = null
+    private var v0: T = null,
+    private var v1: T = null,
+    private var v2: T = null
 ) extends LocalsX[T] {
 
     override final def size: Int = 3
@@ -749,10 +749,10 @@ private[mutable] final class Locals3[T >: Null <: AnyRef](
 }
 
 private[mutable] final class Locals4[T >: Null <: AnyRef](
-        private var v0: T = null,
-        private var v1: T = null,
-        private var v2: T = null,
-        private var v3: T = null
+    private var v0: T = null,
+    private var v1: T = null,
+    private var v2: T = null,
+    private var v3: T = null
 ) extends LocalsX[T] {
 
     override final def size: Int = 4
@@ -930,8 +930,8 @@ private[mutable] final class Locals4[T >: Null <: AnyRef](
 }
 
 private[mutable] final class Locals5[T >: Null <: AnyRef](
-        final val vs1: Locals2[T] = new Locals2[T],
-        final val vs2: Locals3[T] = new Locals3[T]
+    final val vs1: Locals2[T] = new Locals2[T],
+    final val vs2: Locals3[T] = new Locals3[T]
 ) extends LocalsX[T] {
 
     final def size: Int = 5
@@ -1046,8 +1046,8 @@ private[mutable] final class Locals5[T >: Null <: AnyRef](
 }
 
 private[mutable] final class Locals6[T >: Null <: AnyRef](
-        val vs1: Locals3[T] = new Locals3[T],
-        val vs2: Locals3[T] = new Locals3[T]
+    val vs1: Locals3[T] = new Locals3[T],
+    val vs2: Locals3[T] = new Locals3[T]
 ) extends LocalsX[T] {
 
     def size: Int = 6
@@ -1160,8 +1160,8 @@ private[mutable] final class Locals6[T >: Null <: AnyRef](
 }
 
 private[mutable] final class Locals7[T >: Null <: AnyRef](
-        val vs1: Locals3[T] = new Locals3[T],
-        val vs2: Locals4[T] = new Locals4[T]
+    val vs1: Locals3[T] = new Locals3[T],
+    val vs2: Locals4[T] = new Locals4[T]
 ) extends LocalsX[T] {
 
     def size: Int = 7
@@ -1274,9 +1274,9 @@ private[mutable] final class Locals7[T >: Null <: AnyRef](
 }
 
 private[mutable] final class Locals8[T >: Null <: AnyRef](
-        val vs1: Locals2[T] = new Locals2[T],
-        val vs2: Locals3[T] = new Locals3[T],
-        val vs3: Locals3[T] = new Locals3[T]
+    val vs1: Locals2[T] = new Locals2[T],
+    val vs2: Locals3[T] = new Locals3[T],
+    val vs3: Locals3[T] = new Locals3[T]
 ) extends LocalsX[T] {
 
     def size: Int = 8
@@ -1433,9 +1433,9 @@ private[mutable] final class Locals8[T >: Null <: AnyRef](
 }
 
 private[mutable] final class Locals9[T >: Null <: AnyRef](
-        val vs1: Locals3[T] = new Locals3[T],
-        val vs2: Locals3[T] = new Locals3[T],
-        val vs3: Locals3[T] = new Locals3[T]
+    val vs1: Locals3[T] = new Locals3[T],
+    val vs2: Locals3[T] = new Locals3[T],
+    val vs3: Locals3[T] = new Locals3[T]
 ) extends LocalsX[T] {
 
     def size: Int = 9
@@ -1593,9 +1593,9 @@ private[mutable] final class Locals9[T >: Null <: AnyRef](
 }
 
 private[mutable] final class Locals10[T >: Null <: AnyRef](
-        val vs1: Locals4[T] = new Locals4[T],
-        val vs2: Locals3[T] = new Locals3[T],
-        val vs3: Locals3[T] = new Locals3[T]
+    val vs1: Locals4[T] = new Locals4[T],
+    val vs2: Locals3[T] = new Locals3[T],
+    val vs3: Locals3[T] = new Locals3[T]
 ) extends LocalsX[T] {
 
     def size: Int = 10
@@ -1751,9 +1751,9 @@ private[mutable] final class Locals10[T >: Null <: AnyRef](
 }
 
 private[mutable] final class Locals11[T >: Null <: AnyRef](
-        val vs1: Locals4[T] = new Locals4[T],
-        val vs2: Locals3[T] = new Locals3[T],
-        val vs3: Locals4[T] = new Locals4[T]
+    val vs1: Locals4[T] = new Locals4[T],
+    val vs2: Locals3[T] = new Locals3[T],
+    val vs3: Locals4[T] = new Locals4[T]
 ) extends LocalsX[T] {
 
     def size: Int = 11
@@ -1913,8 +1913,8 @@ private[mutable] final class Locals11[T >: Null <: AnyRef](
 }
 
 private[mutable] final class Locals12_N[T >: Null <: AnyRef: ClassTag](
-        final val vs11:   Locals11[T],
-        final val vs12_N: Array[T]
+    final val vs11:   Locals11[T],
+    final val vs12_N: Array[T]
 ) extends LocalsX[T] {
 
     def this(size: Int) =
diff --git a/OPAL/ai/src/main/scala/org/opalj/issues/FieldValues.scala b/OPAL/ai/src/main/scala/org/opalj/issues/FieldValues.scala
index 3a13f2b678..2d5f7d3f54 100644
--- a/OPAL/ai/src/main/scala/org/opalj/issues/FieldValues.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/issues/FieldValues.scala
@@ -20,8 +20,8 @@ import org.opalj.br.instructions.FieldReadAccess
  * @author Michael Eichberg
  */
 class FieldValues(
-        val method: Method,
-        val result: AIResult
+    val method: Method,
+    val result: AIResult
 ) extends IssueDetails with MethodComprehension {
 
     final def classFile: ClassFile = method.classFile
diff --git a/OPAL/ai/src/main/scala/org/opalj/issues/Issue.scala b/OPAL/ai/src/main/scala/org/opalj/issues/Issue.scala
index 6458466500..2dcae2ef5f 100644
--- a/OPAL/ai/src/main/scala/org/opalj/issues/Issue.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/issues/Issue.scala
@@ -30,13 +30,13 @@ import scala.xml.Unparsed
  * @author Michael Eichberg
  */
 case class Issue(
-        analysis:   String,
-        relevance:  Relevance,
-        summary:    String,
-        categories: Set[String],
-        kinds:      Set[String],
-        locations:  Seq[IssueLocation],
-        details:    Iterable[IssueDetails] = Nil
+    analysis:   String,
+    relevance:  Relevance,
+    summary:    String,
+    categories: Set[String],
+    kinds:      Set[String],
+    locations:  Seq[IssueLocation],
+    details:    Iterable[IssueDetails] = Nil
 ) extends IssueRepresentations {
 
     assert(!summary.contains('\n'), s"the summary must not contain new lines:\n$summary")
diff --git a/OPAL/ai/src/main/scala/org/opalj/issues/IssueLocation.scala b/OPAL/ai/src/main/scala/org/opalj/issues/IssueLocation.scala
index 43b41376f5..dce10acad1 100644
--- a/OPAL/ai/src/main/scala/org/opalj/issues/IssueLocation.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/issues/IssueLocation.scala
@@ -41,9 +41,9 @@ sealed abstract class IssueLocation extends IssueRepresentations with Comparable
 }
 
 abstract class ProjectLocation(
-        val description: Option[String],
-        val theProject:  SomeProject,
-        val details:     Seq[IssueDetails] = List.empty
+    val description: Option[String],
+    val theProject:  SomeProject,
+    val details:     Seq[IssueDetails] = List.empty
 ) extends IssueLocation {
 
     def compareTo(other: IssueLocation): Int = {
@@ -78,10 +78,10 @@ abstract class ProjectLocation(
 }
 
 class PackageLocation(
-        description:    Option[String],
-        theProject:     SomeProject,
-        val thePackage: String,
-        details:        Seq[IssueDetails] = List.empty
+    description:    Option[String],
+    theProject:     SomeProject,
+    val thePackage: String,
+    details:        Seq[IssueDetails] = List.empty
 ) extends ProjectLocation(description, theProject, details) {
 
     def locationAsInlineXHTML(basicInfoOnly: Boolean): List[Node] = {
@@ -124,10 +124,10 @@ class PackageLocation(
 }
 
 class ClassLocation(
-        description:   Option[String],
-        theProject:    SomeProject,
-        val classFile: ClassFile,
-        details:       Seq[IssueDetails] = List.empty
+    description:   Option[String],
+    theProject:    SomeProject,
+    val classFile: ClassFile,
+    details:       Seq[IssueDetails] = List.empty
 ) extends PackageLocation(description, theProject, classFile.thisType.packageName, details)
     with ClassComprehension {
 
@@ -169,10 +169,10 @@ class ClassLocation(
 }
 
 class MethodLocation(
-        description: Option[String],
-        theProject:  SomeProject,
-        val method:  Method,
-        details:     Seq[IssueDetails] = List.empty
+    description: Option[String],
+    theProject:  SomeProject,
+    val method:  Method,
+    details:     Seq[IssueDetails] = List.empty
 ) extends ClassLocation(description, theProject, method.classFile, details)
     with MethodComprehension {
 
@@ -211,11 +211,11 @@ class MethodLocation(
 }
 
 class InstructionLocation(
-        description: Option[String],
-        theProject:  SomeProject,
-        method:      Method,
-        val pc:      PC,
-        details:     Seq[IssueDetails] = List.empty
+    description: Option[String],
+    theProject:  SomeProject,
+    method:      Method,
+    val pc:      PC,
+    details:     Seq[IssueDetails] = List.empty
 ) extends MethodLocation(description, theProject, method, details) with PCLineComprehension {
 
     assert(method.body.isDefined)
@@ -249,9 +249,9 @@ class InstructionLocation(
 }
 
 class FieldLocation(
-        description: Option[String],
-        theProject:  SomeProject,
-        classFile:   ClassFile,
-        val field:   Field,
-        details:     Seq[IssueDetails] = List.empty
+    description: Option[String],
+    theProject:  SomeProject,
+    classFile:   ClassFile,
+    val field:   Field,
+    details:     Seq[IssueDetails] = List.empty
 ) extends ClassLocation(description, theProject, classFile, details)
diff --git a/OPAL/ai/src/main/scala/org/opalj/issues/LocalVariables.scala b/OPAL/ai/src/main/scala/org/opalj/issues/LocalVariables.scala
index cc26b30837..11835057b2 100644
--- a/OPAL/ai/src/main/scala/org/opalj/issues/LocalVariables.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/issues/LocalVariables.scala
@@ -17,9 +17,9 @@ import org.opalj.collection.mutable.Locals
  * @param   localVariables The register values at the given location.
  */
 class LocalVariables(
-        val code:           Code,
-        val pc:             PC,
-        val localVariables: Locals[_ <: AnyRef]
+    val code:           Code,
+    val pc:             PC,
+    val localVariables: Locals[_ <: AnyRef]
 ) extends IssueDetails {
 
     def toXHTML(basicInfoOnly: Boolean): Node = {
diff --git a/OPAL/ai/src/main/scala/org/opalj/issues/MethodReturnValues.scala b/OPAL/ai/src/main/scala/org/opalj/issues/MethodReturnValues.scala
index 688826da3e..adf31091f1 100644
--- a/OPAL/ai/src/main/scala/org/opalj/issues/MethodReturnValues.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/issues/MethodReturnValues.scala
@@ -16,8 +16,8 @@ import org.opalj.br.instructions.INVOKESTATIC
 import org.opalj.br.instructions.MethodInvocationInstruction
 
 class MethodReturnValues(
-        val method: Method,
-        val result: AIResult
+    val method: Method,
+    val result: AIResult
 ) extends IssueDetails with MethodComprehension {
 
     final def classFile: ClassFile = method.classFile
diff --git a/OPAL/ai/src/main/scala/org/opalj/issues/Operands.scala b/OPAL/ai/src/main/scala/org/opalj/issues/Operands.scala
index 80c9b63f9a..69aa880b60 100644
--- a/OPAL/ai/src/main/scala/org/opalj/issues/Operands.scala
+++ b/OPAL/ai/src/main/scala/org/opalj/issues/Operands.scala
@@ -16,10 +16,10 @@ import org.opalj.br.instructions.StackManagementInstruction
 import org.opalj.collection.mutable.Locals
 
 class Operands(
-        val code:           Code,
-        val pc:             PC,
-        val operands:       List[_ <: AnyRef],
-        val localVariables: Locals[_ <: AnyRef]
+    val code:           Code,
+    val pc:             PC,
+    val operands:       List[_ <: AnyRef],
+    val localVariables: Locals[_ <: AnyRef]
 ) extends IssueDetails with CodeComprehension {
 
     def toXHTML(basicInfoOnly: Boolean): Node = {
diff --git a/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/ConstraintsBetweenIntegerValuesTest.scala b/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/ConstraintsBetweenIntegerValuesTest.scala
index 5d6c01748f..07c7b4bf34 100644
--- a/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/ConstraintsBetweenIntegerValuesTest.scala
+++ b/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/ConstraintsBetweenIntegerValuesTest.scala
@@ -22,7 +22,7 @@ class ConstraintsBetweenIntegerValuesTest extends AnyFunSpec with Matchers {
     final val IrrelevantPC = Int.MinValue
 
     class IntegerRangesWithInterIntegerConstraintsTestDomain(
-            override val maxCardinalityOfIntegerRanges: Long = -(Int.MinValue.toLong) + Int.MaxValue
+        override val maxCardinalityOfIntegerRanges: Long = -(Int.MinValue.toLong) + Int.MaxValue
     ) extends CorrelationalDomain
         with ThrowAllPotentialExceptionsConfiguration
         with l0.DefaultTypeLevelLongValues
diff --git a/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultConcreteArraysTest.scala b/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultConcreteArraysTest.scala
index b2b948195e..d1716b370f 100644
--- a/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultConcreteArraysTest.scala
+++ b/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultConcreteArraysTest.scala
@@ -598,7 +598,7 @@ class DefaultConcreteArraysTest extends AnyFunSpec with Matchers {
 }
 
 class DefaultConcreteArraysTestDomain(
-        override val maxCardinalityOfIntegerRanges: Long = -(Int.MinValue.toLong) + Int.MaxValue
+    override val maxCardinalityOfIntegerRanges: Long = -(Int.MinValue.toLong) + Int.MaxValue
 ) extends CorrelationalDomain
     with GlobalLogContextProvider
     with DefaultSpecialDomainValuesBinding
diff --git a/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultIntegerRangesTest.scala b/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultIntegerRangesTest.scala
index 7d2d4df31e..7bd51ae1dd 100644
--- a/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultIntegerRangesTest.scala
+++ b/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultIntegerRangesTest.scala
@@ -3636,7 +3636,7 @@ class DefaultIntegerRangesTest extends AnyFunSpec with Matchers {
 }
 
 class DefaultIntegerRangesTestDomain(
-        override val maxCardinalityOfIntegerRanges: Long = -(Int.MinValue.toLong) + Int.MaxValue
+    override val maxCardinalityOfIntegerRanges: Long = -(Int.MinValue.toLong) + Int.MaxValue
 ) extends CorrelationalDomain
     with DefaultSpecialDomainValuesBinding
     with ThrowAllPotentialExceptionsConfiguration
@@ -3656,7 +3656,7 @@ class DefaultIntegerRangesTestDomain(
     with RecordLastReturnedValues
 
 class JoinResultsIntegerRangesTestDomain(
-        override val maxCardinalityOfIntegerRanges: Long = -(Int.MinValue.toLong) + Int.MaxValue
+    override val maxCardinalityOfIntegerRanges: Long = -(Int.MinValue.toLong) + Int.MaxValue
 ) extends CorrelationalDomain
     with DefaultSpecialDomainValuesBinding
     with ThrowAllPotentialExceptionsConfiguration
diff --git a/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultIntegerSetsTest.scala b/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultIntegerSetsTest.scala
index 95903d3ab4..cc60e2ab4d 100644
--- a/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultIntegerSetsTest.scala
+++ b/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultIntegerSetsTest.scala
@@ -36,7 +36,7 @@ class DefaultIntegerSetsTest extends AnyFunSpec with Matchers {
     final val SomePC = 100000
 
     class IntegerSetsTestDomain(
-            override val maxCardinalityOfIntegerSets: Int = 126 // <= MAX SUPPORTED VALUE
+        override val maxCardinalityOfIntegerSets: Int = 126 // <= MAX SUPPORTED VALUE
     ) extends CorrelationalDomain
         with DefaultSpecialDomainValuesBinding
         with ThrowAllPotentialExceptionsConfiguration
diff --git a/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultLongSetsTest.scala b/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultLongSetsTest.scala
index 9f3391b1fe..2a2c3f30c6 100644
--- a/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultLongSetsTest.scala
+++ b/OPAL/ai/src/test/scala/org/opalj/ai/domain/l1/DefaultLongSetsTest.scala
@@ -26,7 +26,7 @@ class DefaultLongSetsTest extends AnyFunSpec with Matchers {
     final val SomePC = 100000
 
     class LongSetsTestDomain(
-            override val maxCardinalityOfLongSets: Int = Int.MaxValue
+        override val maxCardinalityOfLongSets: Int = Int.MaxValue
     ) extends CorrelationalDomain
         with DefaultSpecialDomainValuesBinding
         with ThrowAllPotentialExceptionsConfiguration
diff --git a/OPAL/ai/src/test/scala/org/opalj/ai/domain/l2/PerformInvocationsTest.scala b/OPAL/ai/src/test/scala/org/opalj/ai/domain/l2/PerformInvocationsTest.scala
index 4fad64b973..60779cd9e6 100644
--- a/OPAL/ai/src/test/scala/org/opalj/ai/domain/l2/PerformInvocationsTest.scala
+++ b/OPAL/ai/src/test/scala/org/opalj/ai/domain/l2/PerformInvocationsTest.scala
@@ -219,8 +219,8 @@ object PerformInvocationsTestFixture {
         with TheMethod
 
     abstract class InvocationDomain(
-            val project: Project[java.net.URL],
-            val method:  Method
+        val project: Project[java.net.URL],
+        val method:  Method
     ) extends Domain
         with l0.TypeLevelInvokeInstructions
         with PerformInvocations
@@ -261,8 +261,8 @@ object PerformInvocationsTestFixture {
     }
 
     class LiInvocationDomain(
-            project: Project[java.net.URL],
-            method:  Method
+        project: Project[java.net.URL],
+        method:  Method
     ) extends InvocationDomain(project, method) with LiDomain {
 
         protected[this] def createInvocationDomain(
diff --git a/OPAL/ai/src/test/scala/org/opalj/ai/domain/l2/PerformInvocationsWithRecursionDetectionTest.scala b/OPAL/ai/src/test/scala/org/opalj/ai/domain/l2/PerformInvocationsWithRecursionDetectionTest.scala
index 479faba7cd..bedba24bd4 100644
--- a/OPAL/ai/src/test/scala/org/opalj/ai/domain/l2/PerformInvocationsWithRecursionDetectionTest.scala
+++ b/OPAL/ai/src/test/scala/org/opalj/ai/domain/l2/PerformInvocationsWithRecursionDetectionTest.scala
@@ -107,8 +107,8 @@ object PerformInvocationsWithRecursionDetectionTestFixture {
     }
 
     abstract class SharedInvocationDomain(
-            project:    Project[java.net.URL],
-            val method: Method
+        project:    Project[java.net.URL],
+        val method: Method
     ) extends BaseDomain(project) with Domain
         with TheMethod
         with l0.TypeLevelInvokeInstructions
@@ -134,9 +134,9 @@ object PerformInvocationsWithRecursionDetectionTestFixture {
     }
 
     class InvocationDomain(
-            project:                            Project[java.net.URL],
-            method:                             Method,
-            val frequentEvaluationWarningLevel: Int = 10
+        project:                            Project[java.net.URL],
+        method:                             Method,
+        val frequentEvaluationWarningLevel: Int = 10
     ) extends SharedInvocationDomain(project, method) {
         callingDomain =>
 
@@ -178,9 +178,9 @@ object PerformInvocationsWithRecursionDetectionTestFixture {
     }
 
     class ChildInvocationDomain(
-            project:          Project[java.net.URL],
-            method:           Method,
-            val callerDomain: SharedInvocationDomain
+        project:          Project[java.net.URL],
+        method:           Method,
+        val callerDomain: SharedInvocationDomain
     ) extends SharedInvocationDomain(project, method)
         with ChildPerformInvocationsWithRecursionDetection { callingDomain =>
 
diff --git a/OPAL/apk/src/main/scala/org/opalj/apk/ApkComponent.scala b/OPAL/apk/src/main/scala/org/opalj/apk/ApkComponent.scala
index 8c849ecee0..b4fc340e26 100644
--- a/OPAL/apk/src/main/scala/org/opalj/apk/ApkComponent.scala
+++ b/OPAL/apk/src/main/scala/org/opalj/apk/ApkComponent.scala
@@ -23,10 +23,10 @@ import org.opalj.apk.ApkComponentType.ApkComponentType
  * @author Nicolas Gross
  */
 class ApkComponent(
-        val componentType:    ApkComponentType,
-        val clazz:            String,
-        val intentActions:    Seq[String],
-        val intentCategories: Seq[String]
+    val componentType:    ApkComponentType,
+    val clazz:            String,
+    val intentActions:    Seq[String],
+    val intentCategories: Seq[String]
 )(implicit config: Config) {
 
     private val ActivityEntryPoints = Seq.from(
diff --git a/OPAL/apk/src/main/scala/org/opalj/apk/ApkContextRegisteredReceiver.scala b/OPAL/apk/src/main/scala/org/opalj/apk/ApkContextRegisteredReceiver.scala
index c60651424b..49fff4a2fe 100644
--- a/OPAL/apk/src/main/scala/org/opalj/apk/ApkContextRegisteredReceiver.scala
+++ b/OPAL/apk/src/main/scala/org/opalj/apk/ApkContextRegisteredReceiver.scala
@@ -19,10 +19,10 @@ import org.opalj.br.Method
  * @author Nicolas Gross
  */
 class ApkContextRegisteredReceiver(
-        clazz:            String,
-        intentActions:    Seq[String],
-        intentCategories: Seq[String],
-        val method:       Method,
-        val callPc:       UShort
+    clazz:            String,
+    intentActions:    Seq[String],
+    intentCategories: Seq[String],
+    val method:       Method,
+    val callPc:       UShort
 )(implicit config: Config)
     extends ApkComponent(ApkComponentType.BroadcastReceiver, clazz, intentActions, intentCategories)
diff --git a/OPAL/apk/src/main/scala/org/opalj/apk/parser/ApkParser.scala b/OPAL/apk/src/main/scala/org/opalj/apk/parser/ApkParser.scala
index 7d5ac8855a..777b35b55d 100644
--- a/OPAL/apk/src/main/scala/org/opalj/apk/parser/ApkParser.scala
+++ b/OPAL/apk/src/main/scala/org/opalj/apk/parser/ApkParser.scala
@@ -337,8 +337,8 @@ object ApkParser {
 }
 
 case class ApkParserException(
-        message: String,
-        cause:   Throwable = null
+    message: String,
+    cause:   Throwable = null
 ) extends Exception(message, cause)
 
 object DexParser extends Enumeration {
diff --git a/OPAL/av/src/main/scala/org/opalj/av/checking/AnnotationPredicate.scala b/OPAL/av/src/main/scala/org/opalj/av/checking/AnnotationPredicate.scala
index 5ece0d7768..9ac7eb389d 100644
--- a/OPAL/av/src/main/scala/org/opalj/av/checking/AnnotationPredicate.scala
+++ b/OPAL/av/src/main/scala/org/opalj/av/checking/AnnotationPredicate.scala
@@ -104,8 +104,8 @@ object HasAnnotation {
  * @author Marco Torsello
  */
 case class AnnotatedWith(
-        annotationType:    FieldType,
-        elementValuePairs: Seq[ElementValuePair]
+    annotationType:    FieldType,
+    elementValuePairs: Seq[ElementValuePair]
 ) extends AnnotationPredicate {
 
     /**
diff --git a/OPAL/av/src/main/scala/org/opalj/av/checking/AnnotationsPredicate.scala b/OPAL/av/src/main/scala/org/opalj/av/checking/AnnotationsPredicate.scala
index 8fe75d9312..b8f68677c6 100644
--- a/OPAL/av/src/main/scala/org/opalj/av/checking/AnnotationsPredicate.scala
+++ b/OPAL/av/src/main/scala/org/opalj/av/checking/AnnotationsPredicate.scala
@@ -34,7 +34,7 @@ case object AnyAnnotations extends AnnotationsPredicate {
  * @author Marco Torsello
  */
 case class HasAtLeastTheAnnotations(
-        annotationPredicates: Set[_ <: AnnotationPredicate]
+    annotationPredicates: Set[_ <: AnnotationPredicate]
 ) extends AnnotationsPredicate {
 
     def apply(others: Iterable[Annotation]): Boolean = {
@@ -53,7 +53,7 @@ object HasAtLeastTheAnnotations {
  * @author Marco Torsello
  */
 case class HasTheAnnotations(
-        annotationPredicates: Set[_ <: AnnotationPredicate]
+    annotationPredicates: Set[_ <: AnnotationPredicate]
 ) extends AnnotationsPredicate {
 
     def apply(others: Iterable[Annotation]): Boolean = {
@@ -74,7 +74,7 @@ object HasTheAnnotations {
  * @author Marco Torsello
  */
 case class HasAtLeastOneAnnotation(
-        annotationPredicates: Set[_ <: AnnotationPredicate]
+    annotationPredicates: Set[_ <: AnnotationPredicate]
 ) extends AnnotationsPredicate {
 
     def apply(annotations: Iterable[Annotation]): Boolean = {
diff --git a/OPAL/av/src/main/scala/org/opalj/av/checking/ClassMatcher.scala b/OPAL/av/src/main/scala/org/opalj/av/checking/ClassMatcher.scala
index ec696ec61d..f4dd6197c5 100644
--- a/OPAL/av/src/main/scala/org/opalj/av/checking/ClassMatcher.scala
+++ b/OPAL/av/src/main/scala/org/opalj/av/checking/ClassMatcher.scala
@@ -50,13 +50,13 @@ case object AllClasses extends ClassMatcher {
  * @author Marco Torsello
  */
 case class DefaultClassMatcher(
-        accessFlagsMatcher:       AccessFlagsMatcher   = AccessFlagsMatcher.ANY,
-        namePredicate:            NamePredicate        = RegexNamePredicate(""".*""".r),
-        annotationsPredicate:     AnnotationsPredicate = AnyAnnotations,
-        matchSubclasses:          Boolean              = false,
-        matchImplementingclasses: Boolean              = false,
-        matchMethods:             Boolean              = true,
-        matchFields:              Boolean              = true
+    accessFlagsMatcher:       AccessFlagsMatcher   = AccessFlagsMatcher.ANY,
+    namePredicate:            NamePredicate        = RegexNamePredicate(""".*""".r),
+    annotationsPredicate:     AnnotationsPredicate = AnyAnnotations,
+    matchSubclasses:          Boolean              = false,
+    matchImplementingclasses: Boolean              = false,
+    matchMethods:             Boolean              = true,
+    matchFields:              Boolean              = true
 ) extends ClassMatcher {
 
     def isSubClass(classFile: ClassFile, project: SomeProject): Boolean = {
diff --git a/OPAL/av/src/main/scala/org/opalj/av/checking/FieldMatcher.scala b/OPAL/av/src/main/scala/org/opalj/av/checking/FieldMatcher.scala
index 284f7dbf25..9aa04e3bf9 100644
--- a/OPAL/av/src/main/scala/org/opalj/av/checking/FieldMatcher.scala
+++ b/OPAL/av/src/main/scala/org/opalj/av/checking/FieldMatcher.scala
@@ -18,10 +18,10 @@ import org.opalj.br.analyses.SomeProject
  * @author Michael Eichberg
  */
 case class FieldMatcher(
-        declaringClass: ClassLevelMatcher,
-        annotations:    AnnotationsPredicate,
-        theType:        Option[FieldType],
-        theName:        Option[NamePredicate]
+    declaringClass: ClassLevelMatcher,
+    annotations:    AnnotationsPredicate,
+    theType:        Option[FieldType],
+    theName:        Option[NamePredicate]
 ) extends SourceElementsMatcher {
 
     def doesClassFileMatch(classFile: ClassFile)(implicit project: SomeProject): Boolean = {
diff --git a/OPAL/av/src/main/scala/org/opalj/av/checking/MethodMatcher.scala b/OPAL/av/src/main/scala/org/opalj/av/checking/MethodMatcher.scala
index 7a2615365a..71981ef243 100644
--- a/OPAL/av/src/main/scala/org/opalj/av/checking/MethodMatcher.scala
+++ b/OPAL/av/src/main/scala/org/opalj/av/checking/MethodMatcher.scala
@@ -16,9 +16,9 @@ import org.opalj.br.analyses.SomeProject
  * @author Marco Torsello
  */
 case class MethodMatcher(
-        classLevelMatcher:    ClassLevelMatcher              = AllClasses,
-        annotationsPredicate: AnnotationsPredicate           = AnyAnnotations,
-        methodPredicate:      SourceElementPredicate[Method] = AnyMethod
+    classLevelMatcher:    ClassLevelMatcher              = AllClasses,
+    annotationsPredicate: AnnotationsPredicate           = AnyAnnotations,
+    methodPredicate:      SourceElementPredicate[Method] = AnyMethod
 ) extends SourceElementsMatcher {
 
     def doesClassFileMatch(classFile: ClassFile)(implicit project: SomeProject): Boolean = {
diff --git a/OPAL/av/src/main/scala/org/opalj/av/checking/MethodPredicate.scala b/OPAL/av/src/main/scala/org/opalj/av/checking/MethodPredicate.scala
index 72718c73f0..6778d51a4c 100644
--- a/OPAL/av/src/main/scala/org/opalj/av/checking/MethodPredicate.scala
+++ b/OPAL/av/src/main/scala/org/opalj/av/checking/MethodPredicate.scala
@@ -34,8 +34,8 @@ case class MethodWithName(name: String) extends SourceElementPredicate[Method] {
  * @author Marco Torsello
  */
 case class MethodWithSignature(
-        name:       String,
-        descriptor: MethodDescriptor
+    name:       String,
+    descriptor: MethodDescriptor
 ) extends SourceElementPredicate[Method] {
 
     def apply(method: Method): Boolean = {
diff --git a/OPAL/av/src/main/scala/org/opalj/av/checking/PackageMatcher.scala b/OPAL/av/src/main/scala/org/opalj/av/checking/PackageMatcher.scala
index 9d51f1f95b..c5a64619a1 100644
--- a/OPAL/av/src/main/scala/org/opalj/av/checking/PackageMatcher.scala
+++ b/OPAL/av/src/main/scala/org/opalj/av/checking/PackageMatcher.scala
@@ -12,8 +12,8 @@ import org.opalj.br.analyses.SomeProject
  * @author Marco Torsello
  */
 case class PackageMatcher(
-        namePredicate: NamePredicate,
-        classMatcher:  ClassMatcher
+    namePredicate: NamePredicate,
+    classMatcher:  ClassMatcher
 ) extends ClassLevelMatcher {
 
     def doesMatch(classFile: ClassFile)(implicit project: SomeProject): Boolean = {
diff --git a/OPAL/av/src/main/scala/org/opalj/av/checking/SourceElementPredicate.scala b/OPAL/av/src/main/scala/org/opalj/av/checking/SourceElementPredicate.scala
index d42045c96c..18c497030b 100644
--- a/OPAL/av/src/main/scala/org/opalj/av/checking/SourceElementPredicate.scala
+++ b/OPAL/av/src/main/scala/org/opalj/av/checking/SourceElementPredicate.scala
@@ -41,7 +41,7 @@ trait SourceElementPredicate[-S <: ConcreteSourceElement] extends (S => Boolean)
 }
 
 case class AccessFlags(
-        accessFlags: AccessFlagsMatcher
+    accessFlags: AccessFlagsMatcher
 ) extends SourceElementPredicate[ConcreteSourceElement] {
 
     def apply(sourceElement: ConcreteSourceElement): Boolean = {
@@ -57,7 +57,7 @@ case class AccessFlags(
  * @author Michael Eichberg
  */
 case class Attributes(
-        attributes: SourceElementAttributes
+    attributes: SourceElementAttributes
 ) extends SourceElementPredicate[ConcreteSourceElement] {
 
     def apply(sourceElement: ConcreteSourceElement): Boolean = {
diff --git a/OPAL/av/src/main/scala/org/opalj/av/checking/Specification.scala b/OPAL/av/src/main/scala/org/opalj/av/checking/Specification.scala
index 74c095f9f0..32a1dc7135 100644
--- a/OPAL/av/src/main/scala/org/opalj/av/checking/Specification.scala
+++ b/OPAL/av/src/main/scala/org/opalj/av/checking/Specification.scala
@@ -72,8 +72,8 @@ class Specification(val project: Project[URL], val useAnsiColors: Boolean) { spe
         this(project, useAnsiColors = false)
 
     def this(
-            classFiles:    Iterable[(ClassFile, URL)],
-            useAnsiColors: Boolean = false
+        classFiles:    Iterable[(ClassFile, URL)],
+        useAnsiColors: Boolean = false
     ) =
         this(
             run {
@@ -233,8 +233,8 @@ class Specification(val project: Project[URL], val useAnsiColors: Boolean) { spe
     var architectureCheckers: List[ArchitectureChecker] = Nil
 
     case class GlobalIncomingConstraint(
-            targetEnsemble:  Symbol,
-            sourceEnsembles: Seq[Symbol]
+        targetEnsemble:  Symbol,
+        sourceEnsembles: Seq[Symbol]
     ) extends DependencyChecker {
 
         override def targetEnsembles: Seq[Symbol] = Seq(targetEnsemble)
@@ -278,9 +278,9 @@ class Specification(val project: Project[URL], val useAnsiColors: Boolean) { spe
      * belonging to `ey` then a [[SpecificationViolation]] is generated.
      */
     case class LocalOutgoingNotAllowedConstraint(
-            dependencyTypes: Set[DependencyType],
-            sourceEnsemble:  Symbol,
-            targetEnsembles: Seq[Symbol]
+        dependencyTypes: Set[DependencyType],
+        sourceEnsemble:  Symbol,
+        targetEnsembles: Seq[Symbol]
     ) extends DependencyChecker {
 
         if (targetEnsembles.isEmpty)
@@ -345,9 +345,9 @@ class Specification(val project: Project[URL], val useAnsiColors: Boolean) { spe
      * to `ey` then a [[SpecificationViolation]] is generated.
      */
     case class LocalOutgoingOnlyAllowedConstraint(
-            dependencyTypes: Set[DependencyType],
-            sourceEnsemble:  Symbol,
-            targetEnsembles: Seq[Symbol]
+        dependencyTypes: Set[DependencyType],
+        sourceEnsemble:  Symbol,
+        targetEnsembles: Seq[Symbol]
     ) extends DependencyChecker {
 
         if (targetEnsembles.isEmpty)
@@ -421,16 +421,16 @@ class Specification(val project: Project[URL], val useAnsiColors: Boolean) { spe
      *  @param matchAny true if only one match is needed, false if all annotations should match
      */
     case class LocalOutgoingAnnotatedWithConstraint(
-            sourceEnsemble:       Symbol,
-            annotationPredicates: Seq[AnnotationPredicate],
-            property:             String,
-            matchAny:             Boolean
+        sourceEnsemble:       Symbol,
+        annotationPredicates: Seq[AnnotationPredicate],
+        property:             String,
+        matchAny:             Boolean
     ) extends PropertyChecker {
 
         def this(
-                sourceEnsemble:       Symbol,
-                annotationPredicates: Seq[AnnotationPredicate],
-                matchAny:             Boolean = false
+            sourceEnsemble:       Symbol,
+            annotationPredicates: Seq[AnnotationPredicate],
+            matchAny:             Boolean = false
         ) =
             this(
                 sourceEnsemble,
@@ -513,8 +513,8 @@ class Specification(val project: Project[URL], val useAnsiColors: Boolean) { spe
      *  @param methodPredicate The method to match.
      */
     case class LocalOutgoingShouldImplementMethodConstraint(
-            sourceEnsemble:  Symbol,
-            methodPredicate: SourceElementPredicate[Method]
+        sourceEnsemble:  Symbol,
+        methodPredicate: SourceElementPredicate[Method]
     ) extends PropertyChecker {
 
         override def property: String = methodPredicate.toDescription()
@@ -556,8 +556,8 @@ class Specification(val project: Project[URL], val useAnsiColors: Boolean) { spe
      *  @param targetEnsembles Ensembles containing elements, that should be extended by the given classes.
      */
     case class LocalOutgoingShouldExtendConstraint(
-            sourceEnsemble:  Symbol,
-            targetEnsembles: Seq[Symbol]
+        sourceEnsemble:  Symbol,
+        targetEnsembles: Seq[Symbol]
     ) extends PropertyChecker {
 
         override def property: String = targetEnsembles.mkString(", ")
diff --git a/OPAL/av/src/main/scala/org/opalj/av/checking/SpecificationViolation.scala b/OPAL/av/src/main/scala/org/opalj/av/checking/SpecificationViolation.scala
index 2e5029d194..6bf2c6468c 100644
--- a/OPAL/av/src/main/scala/org/opalj/av/checking/SpecificationViolation.scala
+++ b/OPAL/av/src/main/scala/org/opalj/av/checking/SpecificationViolation.scala
@@ -33,12 +33,12 @@ sealed trait SpecificationViolation {
  * @author Marco Torsello
  */
 case class DependencyViolation(
-        project:           SomeProject,
-        dependencyChecker: DependencyChecker,
-        source:            VirtualSourceElement,
-        target:            VirtualSourceElement,
-        dependencyType:    DependencyType,
-        description:       String
+    project:           SomeProject,
+    dependencyChecker: DependencyChecker,
+    source:            VirtualSourceElement,
+    target:            VirtualSourceElement,
+    dependencyType:    DependencyType,
+    description:       String
 ) extends SpecificationViolation {
 
     override def toString(useAnsiColors: Boolean): String = {
@@ -69,11 +69,11 @@ case class DependencyViolation(
  * @author Marco Torsello
  */
 case class PropertyViolation(
-        project:         SomeProject,
-        propertyChecker: PropertyChecker,
-        source:          VirtualSourceElement,
-        propertyType:    String,
-        description:     String
+    project:         SomeProject,
+    propertyChecker: PropertyChecker,
+    source:          VirtualSourceElement,
+    propertyType:    String,
+    description:     String
 ) extends SpecificationViolation {
 
     override def toString(useAnsiColors: Boolean): String = {
diff --git a/OPAL/ba/src/main/scala/org/opalj/ba/CLASS.scala b/OPAL/ba/src/main/scala/org/opalj/ba/CLASS.scala
index d2a0fdd998..2837083990 100644
--- a/OPAL/ba/src/main/scala/org/opalj/ba/CLASS.scala
+++ b/OPAL/ba/src/main/scala/org/opalj/ba/CLASS.scala
@@ -17,14 +17,14 @@ import org.opalj.collection.immutable.UShortPair
  * @author Michael Eichberg
  */
 class CLASS[T](
-        version:         UShortPair,
-        accessModifiers: AccessModifier,
-        thisType:        String,
-        superclassType:  Option[String],
-        interfaceTypes:  ArraySeq[String],
-        fields:          FIELDS,
-        methods:         METHODS[T],
-        attributes:      ArraySeq[br.ClassFileAttributeBuilder]
+    version:         UShortPair,
+    accessModifiers: AccessModifier,
+    thisType:        String,
+    superclassType:  Option[String],
+    interfaceTypes:  ArraySeq[String],
+    fields:          FIELDS,
+    methods:         METHODS[T],
+    attributes:      ArraySeq[br.ClassFileAttributeBuilder]
 ) {
 
     /**
diff --git a/OPAL/ba/src/main/scala/org/opalj/ba/CodeAttributeBuilder.scala b/OPAL/ba/src/main/scala/org/opalj/ba/CodeAttributeBuilder.scala
index e3c1984849..9d7f1ad956 100644
--- a/OPAL/ba/src/main/scala/org/opalj/ba/CodeAttributeBuilder.scala
+++ b/OPAL/ba/src/main/scala/org/opalj/ba/CodeAttributeBuilder.scala
@@ -40,14 +40,14 @@ import org.opalj.collection.mutable.Locals
  * @author Michael Eichberg
  */
 class CodeAttributeBuilder[T] private[ba] (
-        private[ba] val instructions:                   Array[Instruction],
-        private[ba] val hasControlTransferInstructions: Boolean,
-        private[ba] val pcMapping:                      PCMapping, // the PCMapping must not be complete w.r.t. the set of original PCs
-        private[ba] val annotations:                    Map[br.PC, T],
-        private[ba] var maxStack:                       Option[Int],
-        private[ba] var maxLocals:                      Option[Int],
-        private[ba] var exceptionHandlers:              br.ExceptionHandlers,
-        private[ba] var attributes:                     br.Attributes
+    private[ba] val instructions:                   Array[Instruction],
+    private[ba] val hasControlTransferInstructions: Boolean,
+    private[ba] val pcMapping:                      PCMapping, // the PCMapping must not be complete w.r.t. the set of original PCs
+    private[ba] val annotations:                    Map[br.PC, T],
+    private[ba] var maxStack:                       Option[Int],
+    private[ba] var maxLocals:                      Option[Int],
+    private[ba] var exceptionHandlers:              br.ExceptionHandlers,
+    private[ba] var attributes:                     br.Attributes
 ) extends br.CodeAttributeBuilder[(Map[br.PC, T], List[String])] {
 
     def copy(attributes: br.Attributes = this.attributes): CodeAttributeBuilder[T] = {
diff --git a/OPAL/ba/src/main/scala/org/opalj/ba/ExceptionHandlerConfiguration.scala b/OPAL/ba/src/main/scala/org/opalj/ba/ExceptionHandlerConfiguration.scala
index 9e9e3a911a..ffb027cac6 100644
--- a/OPAL/ba/src/main/scala/org/opalj/ba/ExceptionHandlerConfiguration.scala
+++ b/OPAL/ba/src/main/scala/org/opalj/ba/ExceptionHandlerConfiguration.scala
@@ -6,11 +6,11 @@ import scala.collection.immutable.ArraySeq
 import scala.collection.mutable
 
 private[ba] class ExceptionHandlerConfiguration(
-        var position:  Int                   = 0,
-        var startPC:   Int                   = -1, // -1 is illegal and used to identify missing labels
-        var endPC:     Int                   = -1, // -1 is illegal and used to identify missing labels
-        var handlerPC: Int                   = -1, // -1 is illegal and used to identify missing labels
-        var catchType: Option[br.ObjectType] = None
+    var position:  Int                   = 0,
+    var startPC:   Int                   = -1, // -1 is illegal and used to identify missing labels
+    var endPC:     Int                   = -1, // -1 is illegal and used to identify missing labels
+    var handlerPC: Int                   = -1, // -1 is illegal and used to identify missing labels
+    var catchType: Option[br.ObjectType] = None
 )
 
 /**
diff --git a/OPAL/ba/src/main/scala/org/opalj/ba/ExceptionHandlerElement.scala b/OPAL/ba/src/main/scala/org/opalj/ba/ExceptionHandlerElement.scala
index eebb8acfa9..77d56866be 100644
--- a/OPAL/ba/src/main/scala/org/opalj/ba/ExceptionHandlerElement.scala
+++ b/OPAL/ba/src/main/scala/org/opalj/ba/ExceptionHandlerElement.scala
@@ -55,9 +55,9 @@ case class TRYEND(id: Symbol) extends ExceptionHandlerElement {
  *         (finally handler).
  */
 case class CATCH(
-        id:          Symbol,
-        position:    Int,
-        handlerType: Option[br.ObjectType] = None
+    id:          Symbol,
+    position:    Int,
+    handlerType: Option[br.ObjectType] = None
 ) extends ExceptionHandlerElement {
     override final def isTry: Boolean = false
     override final def isCatch: Boolean = true
diff --git a/OPAL/ba/src/main/scala/org/opalj/ba/FIELD.scala b/OPAL/ba/src/main/scala/org/opalj/ba/FIELD.scala
index c26cb810b3..ecc9f89909 100644
--- a/OPAL/ba/src/main/scala/org/opalj/ba/FIELD.scala
+++ b/OPAL/ba/src/main/scala/org/opalj/ba/FIELD.scala
@@ -12,10 +12,10 @@ import scala.collection.immutable.ArraySeq
  * @author Michael Eichberg
  */
 case class FIELD(
-        accessModifiers:    AccessModifier,
-        name:               String,
-        descriptor:         String,
-        attributesBuilders: ArraySeq[br.FieldAttributeBuilder] = ArraySeq.empty
+    accessModifiers:    AccessModifier,
+    name:               String,
+    descriptor:         String,
+    attributesBuilders: ArraySeq[br.FieldAttributeBuilder] = ArraySeq.empty
 ) {
 
     /**
diff --git a/OPAL/ba/src/main/scala/org/opalj/ba/InstructionLikeElement.scala b/OPAL/ba/src/main/scala/org/opalj/ba/InstructionLikeElement.scala
index 70c7e8a4fd..7e98e07f85 100644
--- a/OPAL/ba/src/main/scala/org/opalj/ba/InstructionLikeElement.scala
+++ b/OPAL/ba/src/main/scala/org/opalj/ba/InstructionLikeElement.scala
@@ -43,7 +43,7 @@ object InstructionLikeElement {
  * Wrapper for [[org.opalj.br.instructions.LabeledInstruction]]s.
  */
 case class InstructionElement(
-        instruction: LabeledInstruction
+    instruction: LabeledInstruction
 ) extends InstructionLikeElement[Nothing] {
     override final def isAnnotated: Boolean = false
     override final def annotation: Nothing = throw new UnsupportedOperationException
@@ -53,8 +53,8 @@ case class InstructionElement(
  * Wrapper for annotated [[org.opalj.br.instructions.LabeledInstruction]]s.
  */
 case class AnnotatedInstructionElement[+T](
-        instruction: LabeledInstruction,
-        annotation:  T
+    instruction: LabeledInstruction,
+    annotation:  T
 ) extends InstructionLikeElement[T] {
     override final def isAnnotated: Boolean = true
 }
diff --git a/OPAL/ba/src/main/scala/org/opalj/ba/LabeledCode.scala b/OPAL/ba/src/main/scala/org/opalj/ba/LabeledCode.scala
index 957b09d199..9471e5ef24 100644
--- a/OPAL/ba/src/main/scala/org/opalj/ba/LabeledCode.scala
+++ b/OPAL/ba/src/main/scala/org/opalj/ba/LabeledCode.scala
@@ -29,8 +29,8 @@ import it.unimi.dsi.fastutil.ints.Int2IntAVLTreeMap
  * @param originalCode The original code.
  */
 class LabeledCode(
-        val originalCode:         Code,
-        private var instructions: ArrayBuffer[CodeElement[AnyRef]]
+    val originalCode:         Code,
+    private var instructions: ArrayBuffer[CodeElement[AnyRef]]
 ) {
 
     /**
diff --git a/OPAL/ba/src/main/scala/org/opalj/ba/METHOD.scala b/OPAL/ba/src/main/scala/org/opalj/ba/METHOD.scala
index f04d37fe07..40a2618364 100644
--- a/OPAL/ba/src/main/scala/org/opalj/ba/METHOD.scala
+++ b/OPAL/ba/src/main/scala/org/opalj/ba/METHOD.scala
@@ -15,11 +15,11 @@ import org.opalj.collection.immutable.UShortPair
  * @author Michael Eichberg
  */
 class METHOD[T](
-        accessModifiers: AccessModifier,
-        name:            String,
-        descriptor:      String,
-        code:            Option[br.CodeAttributeBuilder[T]],
-        attributes:      ArraySeq[br.MethodAttributeBuilder]
+    accessModifiers: AccessModifier,
+    name:            String,
+    descriptor:      String,
+    code:            Option[br.CodeAttributeBuilder[T]],
+    attributes:      ArraySeq[br.MethodAttributeBuilder]
 ) {
 
     /**
diff --git a/OPAL/ba/src/main/scala/org/opalj/ba/ProjectBasedClassLoader.scala b/OPAL/ba/src/main/scala/org/opalj/ba/ProjectBasedClassLoader.scala
index f6ceee85f6..2cfe33c729 100644
--- a/OPAL/ba/src/main/scala/org/opalj/ba/ProjectBasedClassLoader.scala
+++ b/OPAL/ba/src/main/scala/org/opalj/ba/ProjectBasedClassLoader.scala
@@ -13,8 +13,8 @@ import org.opalj.br.ObjectType
  * @author Andreas Muttscheller
  */
 class ProjectBasedInMemoryClassLoader(
-        val project: ClassFileRepository,
-        parent:      ClassLoader = classOf[ProjectBasedInMemoryClassLoader].getClassLoader
+    val project: ClassFileRepository,
+    parent:      ClassLoader = classOf[ProjectBasedInMemoryClassLoader].getClassLoader
 ) extends ClassLoader(parent) {
 
     @throws[ClassNotFoundException]
diff --git a/OPAL/ba/src/main/scala/org/opalj/ba/ToDAConfig.scala b/OPAL/ba/src/main/scala/org/opalj/ba/ToDAConfig.scala
index 522303af3a..3424127484 100644
--- a/OPAL/ba/src/main/scala/org/opalj/ba/ToDAConfig.scala
+++ b/OPAL/ba/src/main/scala/org/opalj/ba/ToDAConfig.scala
@@ -8,8 +8,8 @@ package ba
  * @author Michael Eichberg
  */
 case class ToDAConfig(
-        retainOPALAttributes:    Boolean = false,
-        retainUnknownAttributes: Boolean = false
+    retainOPALAttributes:    Boolean = false,
+    retainUnknownAttributes: Boolean = false
 )
 
 object ToDAConfig {
diff --git a/OPAL/bi/src/main/scala/org/opalj/bi/AccessFlagsIterator.scala b/OPAL/bi/src/main/scala/org/opalj/bi/AccessFlagsIterator.scala
index 6033ef8f98..4638985230 100644
--- a/OPAL/bi/src/main/scala/org/opalj/bi/AccessFlagsIterator.scala
+++ b/OPAL/bi/src/main/scala/org/opalj/bi/AccessFlagsIterator.scala
@@ -10,8 +10,8 @@ import org.opalj.bytecode.BytecodeProcessingFailedException
  * to iterate over the flags (synthetic, public, deprecated, etc.) that are set.
  */
 class AccessFlagsIterator private (
-        private[this] var flags:  Int,
-        val potentialAccessFlags: IndexedSeq[AccessFlag]
+    private[this] var flags:  Int,
+    val potentialAccessFlags: IndexedSeq[AccessFlag]
 ) extends Iterator[AccessFlag] {
 
     private[this] var index = -1
diff --git a/OPAL/br/src/main/scala/org/opalj/br/Annotation.scala b/OPAL/br/src/main/scala/org/opalj/br/Annotation.scala
index 5394fb2e9a..54dbe42312 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/Annotation.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/Annotation.scala
@@ -19,8 +19,8 @@ import scala.collection.immutable.ArraySeq
  * @author Arne Lottmann
  */
 case class Annotation(
-        annotationType:    FieldType,
-        elementValuePairs: ElementValuePairs = NoElementValuePairs
+    annotationType:    FieldType,
+    elementValuePairs: ElementValuePairs = NoElementValuePairs
 ) extends AnnotationLike {
 
     def similar(other: Annotation): Boolean = {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/BootstrapMethod.scala b/OPAL/br/src/main/scala/org/opalj/br/BootstrapMethod.scala
index 7b8f4dbb27..5db5b27e43 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/BootstrapMethod.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/BootstrapMethod.scala
@@ -8,8 +8,8 @@ package br
  * @author Michael Eichberg
  */
 case class BootstrapMethod(
-        handle:    MethodHandle,
-        arguments: BootstrapArguments
+    handle:    MethodHandle,
+    arguments: BootstrapArguments
 ) {
 
     def toJava: String = arguments.map(_.toJava).mkString(handle.toJava + "(", ",", ")")
diff --git a/OPAL/br/src/main/scala/org/opalj/br/ClassFile.scala b/OPAL/br/src/main/scala/org/opalj/br/ClassFile.scala
index 9e9ac375b5..4c51623448 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/ClassFile.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/ClassFile.scala
@@ -73,14 +73,14 @@ import org.opalj.log.OPALLogger
  * @author  Michael Eichberg
  */
 final class ClassFile private (
-        val version:        UShortPair,
-        val accessFlags:    Int,
-        val thisType:       ObjectType,
-        val superclassType: Option[ObjectType],
-        val interfaceTypes: ObjectTypes,
-        val fields:         Fields,
-        val methods:        Methods,
-        val attributes:     Attributes
+    val version:        UShortPair,
+    val accessFlags:    Int,
+    val thisType:       ObjectType,
+    val superclassType: Option[ObjectType],
+    val interfaceTypes: ObjectTypes,
+    val fields:         Fields,
+    val methods:        Methods,
+    val attributes:     Attributes
 ) extends ConcreteSourceElement {
 
     methods.foreach { m => assert(m.declaringClassFile == null); m.declaringClassFile = this }
diff --git a/OPAL/br/src/main/scala/org/opalj/br/ClassHierarchy.scala b/OPAL/br/src/main/scala/org/opalj/br/ClassHierarchy.scala
index 62cb9110a2..c13a4101fc 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/ClassHierarchy.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/ClassHierarchy.scala
@@ -102,29 +102,29 @@ import it.unimi.dsi.fastutil.ints.Int2IntArrayMap
  * @author Michael Eichberg
  */
 class ClassHierarchy private (
-        // the case "java.lang.Object" is handled explicitly!
-        private[this] val knownTypesMap:       Array[ObjectType],
-        private[this] val isKnownTypeMap:      Array[Boolean],
-        private[this] val isInterfaceTypeMap:  Array[Boolean],
-        private[this] val isKnownToBeFinalMap: Array[Boolean],
-
-        // The element is null for types for which we have no complete information
-        // (unless it is java.lang.Object)!
-        private[this] val superclassTypeMap:      Array[ObjectType],
-        private[this] val superinterfaceTypesMap: Array[UIDSet[ObjectType]],
-
-        // In the following all elements are non-null for each known type!
-        private[this] val subclassTypesMap:     Array[UIDSet[ObjectType]],
-        private[this] val subinterfaceTypesMap: Array[UIDSet[ObjectType]],
-
-        // DERIVED INFORMATION
-        val rootTypes:                                       UIDSet[ObjectType],
-        val leafTypes:                                       UIDSet[ObjectType],
-        private[this] val isSupertypeInformationCompleteMap: Array[Boolean],
-        private[this] val supertypeInformationMap:           Array[SupertypeInformation],
-        private[this] val subtypeInformationMap:             Array[SubtypeInformation]
+    // the case "java.lang.Object" is handled explicitly!
+    private[this] val knownTypesMap:       Array[ObjectType],
+    private[this] val isKnownTypeMap:      Array[Boolean],
+    private[this] val isInterfaceTypeMap:  Array[Boolean],
+    private[this] val isKnownToBeFinalMap: Array[Boolean],
+
+    // The element is null for types for which we have no complete information
+    // (unless it is java.lang.Object)!
+    private[this] val superclassTypeMap:      Array[ObjectType],
+    private[this] val superinterfaceTypesMap: Array[UIDSet[ObjectType]],
+
+    // In the following all elements are non-null for each known type!
+    private[this] val subclassTypesMap:     Array[UIDSet[ObjectType]],
+    private[this] val subinterfaceTypesMap: Array[UIDSet[ObjectType]],
+
+    // DERIVED INFORMATION
+    val rootTypes:                                       UIDSet[ObjectType],
+    val leafTypes:                                       UIDSet[ObjectType],
+    private[this] val isSupertypeInformationCompleteMap: Array[Boolean],
+    private[this] val supertypeInformationMap:           Array[SupertypeInformation],
+    private[this] val subtypeInformationMap:             Array[SubtypeInformation]
 )(
-        implicit val logContext: LogContext
+    implicit val logContext: LogContext
 ) {
 
     def updatedLogContext(newLogContext: LogContext): ClassHierarchy = {
@@ -222,17 +222,17 @@ class ClassHierarchy private (
         }
 
         case class TypeInfo(
-                objectType:                     String,
-                objectTypeId:                   Int,
-                isInterface:                    Boolean,
-                isFinal:                        Boolean,
-                isRootType:                     Boolean,
-                isLeafType:                     Boolean,
-                isSupertypeInformationComplete: Boolean,
-                superclassType:                 String,
-                superinterfaceTypes:            String,
-                subclassTypes:                  String,
-                subinterfaceTypes:              String
+            objectType:                     String,
+            objectTypeId:                   Int,
+            isInterface:                    Boolean,
+            isFinal:                        Boolean,
+            isRootType:                     Boolean,
+            isLeafType:                     Boolean,
+            isSupertypeInformationComplete: Boolean,
+            superclassType:                 String,
+            superinterfaceTypes:            String,
+            subclassTypes:                  String,
+            subinterfaceTypes:              String
         ) {
             override def toString: String = {
                 s"$objectType \t$objectTypeId \t$isInterface \t$isFinal \t$isRootType \t$isLeafType \t" +
diff --git a/OPAL/br/src/main/scala/org/opalj/br/Code.scala b/OPAL/br/src/main/scala/org/opalj/br/Code.scala
index dbe0463231..e003be012d 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/Code.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/Code.scala
@@ -48,11 +48,11 @@ import org.opalj.util.AnyToAnyThis
  * @author Michael Eichberg
  */
 final class Code private (
-        val maxStack:          Int,
-        val maxLocals:         Int,
-        val instructions:      Array[Instruction],
-        val exceptionHandlers: ExceptionHandlers,
-        val attributes:        Attributes
+    val maxStack:          Int,
+    val maxLocals:         Int,
+    val instructions:      Array[Instruction],
+    val exceptionHandlers: ExceptionHandlers,
+    val attributes:        Attributes
 ) extends Attribute
     with CommonAttributes
     with InstructionsContainer
diff --git a/OPAL/br/src/main/scala/org/opalj/br/CodeAnalysisFailedException.scala b/OPAL/br/src/main/scala/org/opalj/br/CodeAnalysisFailedException.scala
index 48923d1e15..9625215af0 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/CodeAnalysisFailedException.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/CodeAnalysisFailedException.scala
@@ -12,7 +12,7 @@ package br
  * @author Michael Eichberg
  */
 case class CodeAnalysisFailedException(
-        message: String,
-        code:    Code,
-        pc:      PC
+    message: String,
+    code:    Code,
+    pc:      PC
 ) extends RuntimeException(message)
diff --git a/OPAL/br/src/main/scala/org/opalj/br/ConstantFieldValue.scala b/OPAL/br/src/main/scala/org/opalj/br/ConstantFieldValue.scala
index 965f4b8855..9a3c68e14e 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/ConstantFieldValue.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/ConstantFieldValue.scala
@@ -141,7 +141,7 @@ object ConstantFloat {
 }
 
 final case class ConstantString(
-        value: String
+    value: String
 ) extends ConstantFieldValue[String]
     with IsStringValue {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/DeclaredField.scala b/OPAL/br/src/main/scala/org/opalj/br/DeclaredField.scala
index c3fb10d346..4aa6af6645 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/DeclaredField.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/DeclaredField.scala
@@ -41,10 +41,10 @@ sealed abstract class DeclaredField {
  * field definition is not available (in the context of the current analysis).
  */
 final class VirtualDeclaredField private[br] (
-        override val declaringClassType: ObjectType,
-        override val name:               String,
-        override val fieldType:          FieldType,
-        override val id:                 Int
+    override val declaringClassType: ObjectType,
+    override val name:               String,
+    override val fieldType:          FieldType,
+    override val id:                 Int
 ) extends DeclaredField {
 
     override val isDefinedField = false
@@ -61,8 +61,8 @@ final class VirtualDeclaredField private[br] (
  * original reference.
  */
 final class DefinedField private[br] (
-        override val id:           Int,
-        override val definedField: Field
+    override val id:           Int,
+    override val definedField: Field
 ) extends DeclaredField {
 
     override def declaringClassType: ObjectType = definedField.declaringClassFile.thisType
diff --git a/OPAL/br/src/main/scala/org/opalj/br/DeclaredMethod.scala b/OPAL/br/src/main/scala/org/opalj/br/DeclaredMethod.scala
index 85d9b305a1..344f86c534 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/DeclaredMethod.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/DeclaredMethod.scala
@@ -91,10 +91,10 @@ sealed abstract class DeclaredMethod {
  * may have several package-private methods with the same signature.
  */
 final class VirtualDeclaredMethod private[br] (
-        override val declaringClassType: ObjectType,
-        override val name:               String,
-        override val descriptor:         MethodDescriptor,
-        override val id:                 Int
+    override val declaringClassType: ObjectType,
+    override val name:               String,
+    override val descriptor:         MethodDescriptor,
+    override val id:                 Int
 ) extends DeclaredMethod {
 
     override def isVirtualOrHasSingleDefinedMethod: Boolean = true
@@ -121,9 +121,9 @@ final class VirtualDeclaredMethod private[br] (
  * class along with a reference to the original declaration.
  */
 final class DefinedMethod private[br] (
-        override val declaringClassType: ObjectType,
-        override val definedMethod:      Method,
-        override val id:                 Int
+    override val declaringClassType: ObjectType,
+    override val definedMethod:      Method,
+    override val id:                 Int
 ) extends DeclaredMethod {
 
     override def name: String = definedMethod.name
@@ -146,9 +146,9 @@ final class DefinedMethod private[br] (
 }
 
 final class MultipleDefinedMethods private[br] (
-        override val declaringClassType: ObjectType,
-        override val definedMethods:     ArraySeq[Method],
-        override val id:                 Int
+    override val declaringClassType: ObjectType,
+    override val definedMethods:     ArraySeq[Method],
+    override val id:                 Int
 ) extends DeclaredMethod {
 
     override def name: String = definedMethods.head.name
diff --git a/OPAL/br/src/main/scala/org/opalj/br/DynamicConstant.scala b/OPAL/br/src/main/scala/org/opalj/br/DynamicConstant.scala
index 091c0704a7..7a67673a1e 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/DynamicConstant.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/DynamicConstant.scala
@@ -10,9 +10,9 @@ import org.opalj.bytecode.BytecodeProcessingFailedException
  * `DynamicConstant` is used to represent dynamic constant arguments of bootstrap methods.
  */
 final class DynamicConstant(
-        val name:             String,
-        val descriptor:       FieldType,
-        private val bsmIndex: Int
+    val name:             String,
+    val descriptor:       FieldType,
+    private val bsmIndex: Int
 ) extends ConstantValue[Any] {
     private var bsm: BootstrapMethod = null
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/EnclosingMethod.scala b/OPAL/br/src/main/scala/org/opalj/br/EnclosingMethod.scala
index 8d690a50b4..2610b112b6 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/EnclosingMethod.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/EnclosingMethod.scala
@@ -13,9 +13,9 @@ package br
  * @author Michael Eichberg
  */
 case class EnclosingMethod(
-        clazz:      ObjectType,
-        name:       Option[String],
-        descriptor: Option[MethodDescriptor]
+    clazz:      ObjectType,
+    name:       Option[String],
+    descriptor: Option[MethodDescriptor]
 ) extends Attribute {
 
     assert(name.isDefined == descriptor.isDefined)
diff --git a/OPAL/br/src/main/scala/org/opalj/br/ExceptionHandler.scala b/OPAL/br/src/main/scala/org/opalj/br/ExceptionHandler.scala
index f11fc94a2b..4de68cb633 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/ExceptionHandler.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/ExceptionHandler.scala
@@ -16,10 +16,10 @@ package br
  * @author Michael Eichberg
  */
 case class ExceptionHandler(
-        startPC:   Int,
-        endPC:     Int,
-        handlerPC: Int,
-        catchType: Option[ObjectType]
+    startPC:   Int,
+    endPC:     Int,
+    handlerPC: Int,
+    catchType: Option[ObjectType]
 ) {
     override def toString: String = {
         val exceptionType = catchType.map(_.toJava).getOrElse("<FINALLY>")
diff --git a/OPAL/br/src/main/scala/org/opalj/br/Field.scala b/OPAL/br/src/main/scala/org/opalj/br/Field.scala
index b051715e8e..b47731a004 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/Field.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/Field.scala
@@ -170,10 +170,10 @@ sealed abstract class JVMField extends ClassMember with Ordered[JVMField] {
 }
 
 final class FieldTemplate private[br] (
-        val accessFlags: Int,
-        val name:        String, // the name is interned to enable reference comparisons!
-        val fieldType:   FieldType,
-        val attributes:  Attributes
+    val accessFlags: Int,
+    val name:        String, // the name is interned to enable reference comparisons!
+    val fieldType:   FieldType,
+    val attributes:  Attributes
 ) extends JVMField {
 
     override final def isField: Boolean = false
@@ -181,11 +181,11 @@ final class FieldTemplate private[br] (
 }
 
 final class Field private[br] (
-        private[br] var declaringClassFile: ClassFile, // the back-link can be updated to enable efficient load-time transformations
-        val accessFlags:                    Int,
-        val name:                           String, // the name is interned to enable reference comparisons!
-        val fieldType:                      FieldType,
-        val attributes:                     Attributes
+    private[br] var declaringClassFile: ClassFile, // the back-link can be updated to enable efficient load-time transformations
+    val accessFlags:                    Int,
+    val name:                           String, // the name is interned to enable reference comparisons!
+    val fieldType:                      FieldType,
+    val attributes:                     Attributes
 ) extends JVMField {
 
     // see ClassFile.unsafeReplaceMethod for THE usage!
diff --git a/OPAL/br/src/main/scala/org/opalj/br/InnerClassTable.scala b/OPAL/br/src/main/scala/org/opalj/br/InnerClassTable.scala
index 7f2b6bba33..01fdc1334f 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/InnerClassTable.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/InnerClassTable.scala
@@ -36,10 +36,10 @@ object InnerClassTable {
 }
 
 case class InnerClass(
-        innerClassType:        ObjectType,
-        outerClassType:        Option[ObjectType],
-        innerName:             Option[String],
-        innerClassAccessFlags: Int
+    innerClassType:        ObjectType,
+    outerClassType:        Option[ObjectType],
+    innerName:             Option[String],
+    innerClassAccessFlags: Int
 ) {
 
     override def toString(): String = {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/LocalVariable.scala b/OPAL/br/src/main/scala/org/opalj/br/LocalVariable.scala
index 357aa812e9..ce20a46aaf 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/LocalVariable.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/LocalVariable.scala
@@ -8,11 +8,11 @@ package br
  * @author Michael Eichberg
  */
 case class LocalVariable(
-        startPC:   PC,
-        length:    Int,
-        name:      String,
-        fieldType: FieldType,
-        index:     Int
+    startPC:   PC,
+    length:    Int,
+    name:      String,
+    fieldType: FieldType,
+    index:     Int
 ) {
 
     def remapPCs(codeSize: Int, f: PC => PC): Option[LocalVariable] = {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/LocalVariableTypeTable.scala b/OPAL/br/src/main/scala/org/opalj/br/LocalVariableTypeTable.scala
index 4482ec2019..ab29df8c78 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/LocalVariableTypeTable.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/LocalVariableTypeTable.scala
@@ -38,11 +38,11 @@ object LocalVariableTypeTable {
 }
 
 case class LocalVariableType(
-        startPC:   PC,
-        length:    Int,
-        name:      String,
-        signature: FieldTypeSignature,
-        index:     Int
+    startPC:   PC,
+    length:    Int,
+    name:      String,
+    signature: FieldTypeSignature,
+    index:     Int
 ) {
     def remapPCs(codeSize: Int, f: PC => PC): Option[LocalVariableType] = {
         val newStartPC = f(startPC)
diff --git a/OPAL/br/src/main/scala/org/opalj/br/Method.scala b/OPAL/br/src/main/scala/org/opalj/br/Method.scala
index 7a42da3a5e..e4b908797f 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/Method.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/Method.scala
@@ -389,11 +389,11 @@ sealed abstract class JVMMethod
  * A method which is not (yet) associated with a class file.
  */
 final class MethodTemplate private[br] (
-        val accessFlags: Int,
-        val name:        String,
-        val descriptor:  MethodDescriptor,
-        val body:        Option[Code],
-        val attributes:  Attributes
+    val accessFlags: Int,
+    val name:        String,
+    val descriptor:  MethodDescriptor,
+    val body:        Option[Code],
+    val attributes:  Attributes
 ) extends JVMMethod {
 
     /** This template is not (yet) a [[Method]] which is a [[SourceElement]]. */
@@ -408,12 +408,12 @@ final class MethodTemplate private[br] (
  * @param declaringClassFile The declaring class file.
  */
 final class Method private[br] (
-        private[br] var declaringClassFile: ClassFile, // the back-link can be updated to enable efficient load-time transformations
-        val accessFlags:                    Int,
-        val name:                           String,
-        val descriptor:                     MethodDescriptor,
-        val body:                           Option[Code],
-        val attributes:                     Attributes
+    private[br] var declaringClassFile: ClassFile, // the back-link can be updated to enable efficient load-time transformations
+    val accessFlags:                    Int,
+    val name:                           String,
+    val descriptor:                     MethodDescriptor,
+    val body:                           Option[Code],
+    val attributes:                     Attributes
 ) extends JVMMethod {
 
     // see ClassFile._UNSAFE_replaceMethod for THE usage!
diff --git a/OPAL/br/src/main/scala/org/opalj/br/MethodDescriptor.scala b/OPAL/br/src/main/scala/org/opalj/br/MethodDescriptor.scala
index 22e207c45c..90858e5335 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/MethodDescriptor.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/MethodDescriptor.scala
@@ -210,8 +210,8 @@ private final class NoArgumentMethodDescriptor(val returnType: Type) extends Met
 }
 
 private final class SingleArgumentMethodDescriptor(
-        val parameterType: FieldType,
-        val returnType:    Type
+    val parameterType: FieldType,
+    val returnType:    Type
 ) extends MethodDescriptor {
 
     override def parameterTypes: FieldTypes = ArraySeq(parameterType)
@@ -258,9 +258,9 @@ private final class SingleArgumentMethodDescriptor(
 }
 
 private final class TwoArgumentsMethodDescriptor(
-        val firstParameterType:  FieldType,
-        val secondParameterType: FieldType,
-        val returnType:          Type
+    val firstParameterType:  FieldType,
+    val secondParameterType: FieldType,
+    val returnType:          Type
 ) extends MethodDescriptor {
 
     override def parameterTypes: FieldTypes = ArraySeq(firstParameterType, secondParameterType)
@@ -322,8 +322,8 @@ private final class TwoArgumentsMethodDescriptor(
 }
 
 private final class MultiArgumentsMethodDescriptor(
-        val parameterTypes: FieldTypes,
-        val returnType:     Type
+    val parameterTypes: FieldTypes,
+    val returnType:     Type
 ) extends MethodDescriptor {
 
     override def parameterType(index: Int): FieldType = parameterTypes(index)
diff --git a/OPAL/br/src/main/scala/org/opalj/br/MethodHandle.scala b/OPAL/br/src/main/scala/org/opalj/br/MethodHandle.scala
index f740b78539..1d487d5629 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/MethodHandle.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/MethodHandle.scala
@@ -59,33 +59,33 @@ sealed trait InstanceFieldAccessMethodHandle extends FieldAccessMethodHandle
 sealed trait StaticFieldAccessMethodHandle extends FieldAccessMethodHandle
 
 case class GetFieldMethodHandle(
-        declaringClassType: ObjectType,
-        name:               String,
-        fieldType:          FieldType
+    declaringClassType: ObjectType,
+    name:               String,
+    fieldType:          FieldType
 ) extends FieldReadAccessMethodHandle with InstanceFieldAccessMethodHandle {
     override def referenceKind: ReferenceKind = REF_getField
 }
 
 case class GetStaticMethodHandle(
-        declaringClassType: ObjectType,
-        name:               String,
-        fieldType:          FieldType
+    declaringClassType: ObjectType,
+    name:               String,
+    fieldType:          FieldType
 ) extends FieldReadAccessMethodHandle with StaticFieldAccessMethodHandle {
     override def referenceKind: ReferenceKind = REF_getStatic
 }
 
 case class PutFieldMethodHandle(
-        declaringClassType: ObjectType,
-        name:               String,
-        fieldType:          FieldType
+    declaringClassType: ObjectType,
+    name:               String,
+    fieldType:          FieldType
 ) extends FieldWriteAccessMethodHandle with InstanceFieldAccessMethodHandle {
     override def referenceKind: ReferenceKind = REF_putField
 }
 
 case class PutStaticMethodHandle(
-        declaringClassType: ObjectType,
-        name:               String,
-        fieldType:          FieldType
+    declaringClassType: ObjectType,
+    name:               String,
+    fieldType:          FieldType
 ) extends FieldWriteAccessMethodHandle with StaticFieldAccessMethodHandle {
     override def referenceKind: ReferenceKind = REF_putStatic
 }
@@ -114,9 +114,9 @@ object MethodCallMethodHandle {
 }
 
 case class InvokeVirtualMethodHandle(
-        receiverType:     ReferenceType,
-        name:             String,
-        methodDescriptor: MethodDescriptor
+    receiverType:     ReferenceType,
+    name:             String,
+    methodDescriptor: MethodDescriptor
 ) extends MethodCallMethodHandle {
 
     override def opcodeOfUnderlyingInstruction: Opcode = instructions.INVOKEVIRTUAL.opcode
@@ -125,10 +125,10 @@ case class InvokeVirtualMethodHandle(
 }
 
 case class InvokeStaticMethodHandle(
-        receiverType:     ReferenceType,
-        isInterface:      Boolean,
-        name:             String,
-        methodDescriptor: MethodDescriptor
+    receiverType:     ReferenceType,
+    isInterface:      Boolean,
+    name:             String,
+    methodDescriptor: MethodDescriptor
 ) extends MethodCallMethodHandle {
 
     override def opcodeOfUnderlyingInstruction: Opcode = instructions.INVOKESTATIC.opcode
@@ -139,10 +139,10 @@ case class InvokeStaticMethodHandle(
 }
 
 case class InvokeSpecialMethodHandle(
-        receiverType:     ReferenceType,
-        isInterface:      Boolean,
-        name:             String,
-        methodDescriptor: MethodDescriptor
+    receiverType:     ReferenceType,
+    isInterface:      Boolean,
+    name:             String,
+    methodDescriptor: MethodDescriptor
 ) extends MethodCallMethodHandle {
 
     override def opcodeOfUnderlyingInstruction: Opcode = instructions.INVOKESPECIAL.opcode
@@ -151,8 +151,8 @@ case class InvokeSpecialMethodHandle(
 }
 
 case class NewInvokeSpecialMethodHandle(
-        receiverType:     ObjectType,
-        methodDescriptor: MethodDescriptor
+    receiverType:     ObjectType,
+    methodDescriptor: MethodDescriptor
 ) extends MethodCallMethodHandle {
 
     override final val name = "<init>"
@@ -163,9 +163,9 @@ case class NewInvokeSpecialMethodHandle(
 }
 
 case class InvokeInterfaceMethodHandle(
-        receiverType:     ReferenceType,
-        name:             String,
-        methodDescriptor: MethodDescriptor
+    receiverType:     ReferenceType,
+    name:             String,
+    methodDescriptor: MethodDescriptor
 ) extends MethodCallMethodHandle {
 
     override def opcodeOfUnderlyingInstruction: Opcode = instructions.INVOKEINTERFACE.opcode
diff --git a/OPAL/br/src/main/scala/org/opalj/br/MethodParameter.scala b/OPAL/br/src/main/scala/org/opalj/br/MethodParameter.scala
index 453ecdbfea..fc0627ea7e 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/MethodParameter.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/MethodParameter.scala
@@ -12,8 +12,8 @@ import org.opalj.bi.ACC_SYNTHETIC
  * @author Michael Eichberg
  */
 case class MethodParameter(
-        name:        Option[String],
-        accessFlags: Int
+    name:        Option[String],
+    accessFlags: Int
 ) {
 
     final def isSynthetic: Boolean = (ACC_SYNTHETIC.mask & accessFlags) != 0
diff --git a/OPAL/br/src/main/scala/org/opalj/br/MethodSignature.scala b/OPAL/br/src/main/scala/org/opalj/br/MethodSignature.scala
index 392bbc2bc1..e66a5e051e 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/MethodSignature.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/MethodSignature.scala
@@ -9,8 +9,8 @@ package br
  * @author Michael Eichberg
  */
 final case class MethodSignature(
-        name:       String,
-        descriptor: MethodDescriptor
+    name:       String,
+    descriptor: MethodDescriptor
 ) {
 
     def toJava: String = descriptor.toJava(name)
diff --git a/OPAL/br/src/main/scala/org/opalj/br/Module.scala b/OPAL/br/src/main/scala/org/opalj/br/Module.scala
index baabf9ed8e..f898c0166f 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/Module.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/Module.scala
@@ -13,14 +13,14 @@ import org.opalj.bi.AccessFlagsContexts
  * @author Michael Eichberg
  */
 case class Module(
-        name:        String,
-        moduleFlags: Int,
-        versionInfo: Option[String],
-        requires:    ArraySeq[Requires],
-        exports:     ArraySeq[Exports],
-        opens:       ArraySeq[Opens],
-        uses:        ArraySeq[ObjectType],
-        provides:    ArraySeq[Provides]
+    name:        String,
+    moduleFlags: Int,
+    versionInfo: Option[String],
+    requires:    ArraySeq[Requires],
+    exports:     ArraySeq[Exports],
+    opens:       ArraySeq[Opens],
+    uses:        ArraySeq[ObjectType],
+    provides:    ArraySeq[Provides]
 ) extends Attribute {
 
     override final def kindId: Int = Module.KindId
diff --git a/OPAL/br/src/main/scala/org/opalj/br/RecordComponent.scala b/OPAL/br/src/main/scala/org/opalj/br/RecordComponent.scala
index af24973a39..2beddafce3 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/RecordComponent.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/RecordComponent.scala
@@ -8,7 +8,7 @@ package br
  * @author Dominik Helm
  */
 case class RecordComponent(
-        name:          String,
-        componentType: FieldType,
-        attributes:    Attributes
+    name:          String,
+    componentType: FieldType,
+    attributes:    Attributes
 )
diff --git a/OPAL/br/src/main/scala/org/opalj/br/RuntimeInvisibleParameterAnnotationTable.scala b/OPAL/br/src/main/scala/org/opalj/br/RuntimeInvisibleParameterAnnotationTable.scala
index b9ca9194f7..45934c33a0 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/RuntimeInvisibleParameterAnnotationTable.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/RuntimeInvisibleParameterAnnotationTable.scala
@@ -8,7 +8,7 @@ package br
  * @author Michael Eichberg
  */
 case class RuntimeInvisibleParameterAnnotationTable(
-        parameterAnnotations: ParameterAnnotations
+    parameterAnnotations: ParameterAnnotations
 ) extends ParameterAnnotationTable {
 
     final def isRuntimeVisible: Boolean = false
diff --git a/OPAL/br/src/main/scala/org/opalj/br/RuntimeInvisibleTypeAnnotationTable.scala b/OPAL/br/src/main/scala/org/opalj/br/RuntimeInvisibleTypeAnnotationTable.scala
index c461efdfa4..f6e27c9f6a 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/RuntimeInvisibleTypeAnnotationTable.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/RuntimeInvisibleTypeAnnotationTable.scala
@@ -8,7 +8,7 @@ package br
  * @author Michael Eichberg
  */
 case class RuntimeInvisibleTypeAnnotationTable(
-        typeAnnotations: TypeAnnotations
+    typeAnnotations: TypeAnnotations
 ) extends TypeAnnotationTable {
 
     final def isRuntimeVisible: Boolean = false
diff --git a/OPAL/br/src/main/scala/org/opalj/br/RuntimeVisibleParameterAnnotationTable.scala b/OPAL/br/src/main/scala/org/opalj/br/RuntimeVisibleParameterAnnotationTable.scala
index 1abc8c0bb7..f931a06e67 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/RuntimeVisibleParameterAnnotationTable.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/RuntimeVisibleParameterAnnotationTable.scala
@@ -8,7 +8,7 @@ package br
  * @author Michael Eichberg
  */
 case class RuntimeVisibleParameterAnnotationTable(
-        parameterAnnotations: ParameterAnnotations
+    parameterAnnotations: ParameterAnnotations
 ) extends ParameterAnnotationTable {
 
     final def isRuntimeVisible: Boolean = true
diff --git a/OPAL/br/src/main/scala/org/opalj/br/RuntimeVisibleTypeAnnotationTable.scala b/OPAL/br/src/main/scala/org/opalj/br/RuntimeVisibleTypeAnnotationTable.scala
index 28b84212c3..426d14e3cb 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/RuntimeVisibleTypeAnnotationTable.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/RuntimeVisibleTypeAnnotationTable.scala
@@ -8,7 +8,7 @@ package br
  * @author Michael Eichberg
  */
 case class RuntimeVisibleTypeAnnotationTable(
-        typeAnnotations: TypeAnnotations
+    typeAnnotations: TypeAnnotations
 ) extends TypeAnnotationTable {
 
     final def isRuntimeVisible: Boolean = true
diff --git a/OPAL/br/src/main/scala/org/opalj/br/Signature.scala b/OPAL/br/src/main/scala/org/opalj/br/Signature.scala
index f69da45b5b..652e998d7c 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/Signature.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/Signature.scala
@@ -235,9 +235,9 @@ import Signature.formalTypeParametersToJVMSignature
  * @see For matching signatures see [[Signature]].
  */
 case class ClassSignature(
-        formalTypeParameters:     List[FormalTypeParameter],
-        superClassSignature:      ClassTypeSignature,
-        superInterfacesSignature: List[ClassTypeSignature]
+    formalTypeParameters:     List[FormalTypeParameter],
+    superClassSignature:      ClassTypeSignature,
+    superInterfacesSignature: List[ClassTypeSignature]
 ) extends Signature {
 
     def accept[T](sv: SignatureVisitor[T]): T = sv.visit(this)
@@ -268,10 +268,10 @@ object ClassSignature {
  * @see For matching signatures see [[Signature]].
  */
 case class MethodTypeSignature(
-        formalTypeParameters:     List[FormalTypeParameter],
-        parametersTypeSignatures: List[TypeSignature],
-        returnTypeSignature:      ReturnTypeSignature,
-        throwsSignature:          List[ThrowsSignature]
+    formalTypeParameters:     List[FormalTypeParameter],
+    parametersTypeSignatures: List[TypeSignature],
+    returnTypeSignature:      ReturnTypeSignature,
+    throwsSignature:          List[ThrowsSignature]
 ) extends Signature {
 
     def accept[T](sv: SignatureVisitor[T]): T = sv.visit(this)
@@ -330,9 +330,9 @@ object ArrayTypeSignature {
  * @see For matching signatures see [[Signature]].
  */
 case class ClassTypeSignature(
-        packageIdentifier:        Option[String],
-        simpleClassTypeSignature: SimpleClassTypeSignature,
-        classTypeSignatureSuffix: List[SimpleClassTypeSignature]
+    packageIdentifier:        Option[String],
+    simpleClassTypeSignature: SimpleClassTypeSignature,
+    classTypeSignatureSuffix: List[SimpleClassTypeSignature]
 ) extends FieldTypeSignature with ThrowsSignature {
 
     def objectType: ObjectType = {
@@ -379,7 +379,7 @@ object ClassTypeSignature {
  * @see For matching signatures see [[Signature]].
  */
 case class TypeVariableSignature(
-        identifier: String
+    identifier: String
 ) extends FieldTypeSignature with ThrowsSignature {
 
     def accept[T](sv: SignatureVisitor[T]): T = sv.visit(this)
@@ -400,8 +400,8 @@ object TypeVariableSignature {
  * @see For matching signatures see [[Signature]].
  */
 case class SimpleClassTypeSignature(
-        simpleName:    String,
-        typeArguments: List[TypeArgument]
+    simpleName:    String,
+    typeArguments: List[TypeArgument]
 ) {
 
     def accept[T](sv: SignatureVisitor[T]): T = sv.visit(this)
@@ -419,9 +419,9 @@ case class SimpleClassTypeSignature(
  * @see For matching signatures see [[Signature]].
  */
 case class FormalTypeParameter(
-        identifier:     String,
-        classBound:     Option[FieldTypeSignature],
-        interfaceBound: List[FieldTypeSignature]
+    identifier:     String,
+    classBound:     Option[FieldTypeSignature],
+    interfaceBound: List[FieldTypeSignature]
 ) {
 
     def accept[T](sv: SignatureVisitor[T]): T = sv.visit(this)
@@ -448,8 +448,8 @@ sealed abstract class TypeArgument extends SignatureElement
  * @see For matching signatures see [[Signature]].
  */
 case class ProperTypeArgument(
-        varianceIndicator:  Option[VarianceIndicator],
-        fieldTypeSignature: FieldTypeSignature
+    varianceIndicator:  Option[VarianceIndicator],
+    fieldTypeSignature: FieldTypeSignature
 ) extends TypeArgument {
 
     def accept[T](sv: SignatureVisitor[T]): T = sv.visit(this)
diff --git a/OPAL/br/src/main/scala/org/opalj/br/StackMapFrame.scala b/OPAL/br/src/main/scala/org/opalj/br/StackMapFrame.scala
index a03e84800f..0f07aa1a4f 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/StackMapFrame.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/StackMapFrame.scala
@@ -30,15 +30,15 @@ final case class SameFrame(frameType: Int) extends StackMapFrame {
 }
 
 final case class SameLocals1StackItemFrame(
-        frameType:                     Int,
-        verificationTypeInfoStackItem: VerificationTypeInfo
+    frameType:                     Int,
+    verificationTypeInfoStackItem: VerificationTypeInfo
 ) extends StackMapFrame {
     final def offset(previousOffset: Int): Int = previousOffset + frameType - 64 + 1
 }
 
 final case class SameLocals1StackItemFrameExtended(
-        offsetDelta:                   Int,
-        verificationTypeInfoStackItem: VerificationTypeInfo
+    offsetDelta:                   Int,
+    verificationTypeInfoStackItem: VerificationTypeInfo
 ) extends StackMapFrame {
     final def frameType: Int = 247
     final def offset(previousOffset: Int): Int = previousOffset + offsetDelta + 1
@@ -73,17 +73,17 @@ final case class SameFrameExtended(offsetDelta: Int) extends StackMapFrame {
 }
 
 final case class AppendFrame(
-        frameType:                  Int,
-        offsetDelta:                Int,
-        verificationTypeInfoLocals: VerificationTypeInfoLocals
+    frameType:                  Int,
+    offsetDelta:                Int,
+    verificationTypeInfoLocals: VerificationTypeInfoLocals
 ) extends StackMapFrame {
     final def offset(previousOffset: Int): Int = previousOffset + offsetDelta + 1
 }
 
 final case class FullFrame(
-        offsetDelta:                Int,
-        verificationTypeInfoLocals: VerificationTypeInfoLocals,
-        verificationTypeInfoStack:  VerificationTypeInfoStack
+    offsetDelta:                Int,
+    verificationTypeInfoLocals: VerificationTypeInfoLocals,
+    verificationTypeInfoStack:  VerificationTypeInfoStack
 ) extends StackMapFrame {
     final def frameType: Int = 255
     final def offset(previousOffset: Int): Int = previousOffset + offsetDelta + 1
diff --git a/OPAL/br/src/main/scala/org/opalj/br/StructureIdentifier.scala b/OPAL/br/src/main/scala/org/opalj/br/StructureIdentifier.scala
index c47a9de88c..b4f7921ab0 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/StructureIdentifier.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/StructureIdentifier.scala
@@ -41,9 +41,9 @@ case class TypeIdentifier(t: Type) extends StructureIdentifier {
 }
 
 case class MethodIdentifier(
-        declaringReferenceType: ReferenceType,
-        methodName:             String,
-        methodDescriptor:       MethodDescriptor
+    declaringReferenceType: ReferenceType,
+    methodName:             String,
+    methodDescriptor:       MethodDescriptor
 ) extends StructureIdentifier {
 
     def toHRR: String =
@@ -59,8 +59,8 @@ case class MethodIdentifier(
 }
 
 case class FieldIdentifier(
-        declaringObjectType: ObjectType,
-        fieldName:           String
+    declaringObjectType: ObjectType,
+    fieldName:           String
 ) extends StructureIdentifier {
 
     def toHRR: String = declaringObjectType.toJava + "." + fieldName
diff --git a/OPAL/br/src/main/scala/org/opalj/br/SynthesizedClassFiles.scala b/OPAL/br/src/main/scala/org/opalj/br/SynthesizedClassFiles.scala
index 5a09d6f448..72d5e94481 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/SynthesizedClassFiles.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/SynthesizedClassFiles.scala
@@ -22,7 +22,7 @@ package br
  * @author  Michael Eichberg
  */
 case class SynthesizedClassFiles(
-        classFiles: List[( /*generated*/ ClassFile, /*reason*/ Option[AnyRef])]
+    classFiles: List[( /*generated*/ ClassFile, /*reason*/ Option[AnyRef])]
 ) extends Attribute {
 
     override final val kindId = SynthesizedClassFiles.KindId
diff --git a/OPAL/br/src/main/scala/org/opalj/br/Type.scala b/OPAL/br/src/main/scala/org/opalj/br/Type.scala
index 2a08cd8d87..381b1fee8d 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/Type.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/Type.scala
@@ -993,8 +993,8 @@ case object BooleanType extends BooleanType
  *      (e.g. "java/lang/Object").
  */
 final class ObjectType private ( // DO NOT MAKE THIS A CASE CLASS!
-        final val id:  Int,
-        final val fqn: String
+    final val id:  Int,
+    final val fqn: String
 ) extends ReferenceType {
 
     assert(fqn.indexOf('.') == -1, s"invalid object type name: $fqn")
@@ -1480,8 +1480,8 @@ object ObjectType {
  * @author Michael Eichberg
  */
 final class ArrayType private ( // DO NOT MAKE THIS A CASE CLASS!
-        val id:            Int,
-        val componentType: FieldType
+    val id:            Int,
+    val componentType: FieldType
 ) extends ReferenceType {
 
     override def isArrayType = true
diff --git a/OPAL/br/src/main/scala/org/opalj/br/TypeAnnotation.scala b/OPAL/br/src/main/scala/org/opalj/br/TypeAnnotation.scala
index 4154ae8f66..ffdac38919 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/TypeAnnotation.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/TypeAnnotation.scala
@@ -71,10 +71,10 @@ sealed abstract class TypeAnnotationPathElement {
  * @author Michael Eichberg
  */
 case class TypeAnnotation(
-        target:            TypeAnnotationTarget,
-        path:              TypeAnnotationPath,
-        annotationType:    FieldType,
-        elementValuePairs: ElementValuePairs
+    target:            TypeAnnotationTarget,
+    path:              TypeAnnotationPath,
+    annotationType:    FieldType,
+    elementValuePairs: ElementValuePairs
 ) extends AnnotationLike {
     def remapPCs(codeSize: Int, f: PC => PC): Option[TypeAnnotation] = {
         val newTargetOption = target.remapPCs(codeSize, f)
@@ -92,13 +92,13 @@ case class TypeAnnotation(
 //
 
 case class TAOfParameterDeclarationOfClassOrInterface(
-        type_parameter_index: Int
+    type_parameter_index: Int
 ) extends TypeAnnotationTargetInClassDeclaration {
     def typeId: Int = 0x00
 }
 
 case class TAOfParameterDeclarationOfMethodOrConstructor(
-        type_parameter_index: Int
+    type_parameter_index: Int
 ) extends TypeAnnotationTargetInMetodDeclaration {
     def typeId: Int = 0x01
 }
@@ -108,15 +108,15 @@ case class TAOfSupertype(supertype_index: Int) extends TypeAnnotationTargetInCla
 }
 
 case class TAOfTypeBoundOfParameterDeclarationOfClassOrInterface(
-        type_parameter_index: Int,
-        bound_index:          Int
+    type_parameter_index: Int,
+    bound_index:          Int
 ) extends TypeAnnotationTargetInClassDeclaration {
     def typeId: Int = 0x11
 }
 
 case class TAOfTypeBoundOfParameterDeclarationOfMethodOrConstructor(
-        type_parameter_index: Int,
-        bound_index:          Int
+    type_parameter_index: Int,
+    bound_index:          Int
 ) extends TypeAnnotationTargetInMetodDeclaration {
     def typeId: Int = 0x12
 }
@@ -134,7 +134,7 @@ case object TAOfReceiverType extends TypeAnnotationTargetInMetodDeclaration {
 }
 
 case class TAOfFormalParameter(
-        formal_parameter_index: Int
+    formal_parameter_index: Int
 ) extends TypeAnnotationTargetInMetodDeclaration {
     def typeId: Int = 0x16
 }
@@ -148,7 +148,7 @@ sealed abstract class TypeAnnotationTargetInVarDecl extends TypeAnnotationTarget
 }
 
 case class TAOfLocalvarDecl(
-        localVarTable: ArraySeq[LocalvarTableEntry]
+    localVarTable: ArraySeq[LocalvarTableEntry]
 ) extends TypeAnnotationTargetInVarDecl {
 
     override def typeId: Int = 0x40
@@ -163,7 +163,7 @@ case class TAOfLocalvarDecl(
 }
 
 case class TAOfResourcevarDecl(
-        localVarTable: ArraySeq[LocalvarTableEntry]
+    localVarTable: ArraySeq[LocalvarTableEntry]
 ) extends TypeAnnotationTargetInVarDecl {
 
     override def typeId: Int = 0x41
@@ -259,8 +259,8 @@ case class TAOfMethodReferenceExpressionIdentifier(offset: Int) extends TypeAnno
 }
 
 case class TAOfCastExpression(
-        offset:              Int,
-        type_argument_index: Int
+    offset:              Int,
+    type_argument_index: Int
 ) extends TypeAnnotationTargetInCode {
 
     def typeId: Int = 0x47
@@ -275,8 +275,8 @@ case class TAOfCastExpression(
 }
 
 case class TAOfConstructorInvocation(
-        offset:              Int,
-        type_argument_index: Int
+    offset:              Int,
+    type_argument_index: Int
 ) extends TypeAnnotationTargetInCode {
 
     def typeId: Int = 0x48
@@ -291,8 +291,8 @@ case class TAOfConstructorInvocation(
 }
 
 case class TAOfMethodInvocation(
-        offset:              Int,
-        type_argument_index: Int
+    offset:              Int,
+    type_argument_index: Int
 ) extends TypeAnnotationTargetInCode {
 
     def typeId: Int = 0x49
@@ -307,8 +307,8 @@ case class TAOfMethodInvocation(
 }
 
 case class TAOfConstructorInMethodReferenceExpression(
-        offset:              Int,
-        type_argument_index: Int
+    offset:              Int,
+    type_argument_index: Int
 ) extends TypeAnnotationTargetInCode {
 
     def typeId: Int = 0x4A
@@ -326,8 +326,8 @@ case class TAOfConstructorInMethodReferenceExpression(
 }
 
 case class TAOfMethodInMethodReferenceExpression(
-        offset:              Int,
-        type_argument_index: Int
+    offset:              Int,
+    type_argument_index: Int
 ) extends TypeAnnotationTargetInCode {
 
     def typeId: Int = 0x4B
@@ -355,7 +355,7 @@ case object TADirectlyOnType extends TypeAnnotationPath
 
 // path length > 0
 case class TAOnNestedType(
-        path: ArraySeq[TypeAnnotationPathElement]
+    path: ArraySeq[TypeAnnotationPathElement]
 ) extends TypeAnnotationPath
 
 case object TADeeperInArrayType extends TypeAnnotationPathElement {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/TypeDeclaration.scala b/OPAL/br/src/main/scala/org/opalj/br/TypeDeclaration.scala
index 67bcb87a24..7155968427 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/TypeDeclaration.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/TypeDeclaration.scala
@@ -10,8 +10,8 @@ import org.opalj.collection.immutable.UIDSet
  * @author Michael Eichberg
  */
 case class TypeDeclaration(
-        objectType:             ObjectType,
-        isInterfaceType:        Boolean,
-        theSuperclassType:      Option[ObjectType],
-        theSuperinterfaceTypes: UIDSet[ObjectType]
+    objectType:             ObjectType,
+    isInterfaceType:        Boolean,
+    theSuperclassType:      Option[ObjectType],
+    theSuperinterfaceTypes: UIDSet[ObjectType]
 )
diff --git a/OPAL/br/src/main/scala/org/opalj/br/VirtualSourceElement.scala b/OPAL/br/src/main/scala/org/opalj/br/VirtualSourceElement.scala
index 2b048c8b82..6911e482b6 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/VirtualSourceElement.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/VirtualSourceElement.scala
@@ -116,9 +116,9 @@ sealed abstract class VirtualClassMember extends VirtualSourceElement
  * @author Michael Eichberg
  */
 final case class VirtualField(
-        declaringClassType: ObjectType,
-        name:               String,
-        fieldType:          FieldType
+    declaringClassType: ObjectType,
+    name:               String,
+    fieldType:          FieldType
 ) extends VirtualClassMember {
 
     override def isField: Boolean = true
@@ -172,9 +172,9 @@ final case class VirtualField(
  * @author Michael Eichberg
  */
 sealed class VirtualMethod(
-        val declaringClassType: ReferenceType,
-        val name:               String,
-        val descriptor:         MethodDescriptor
+    val declaringClassType: ReferenceType,
+    val name:               String,
+    val descriptor:         MethodDescriptor
 ) extends VirtualClassMember {
 
     override def isMethod: Boolean = true
@@ -251,10 +251,10 @@ object VirtualMethod {
 }
 
 final case class VirtualForwardingMethod(
-        override val declaringClassType: ReferenceType,
-        override val name:               String,
-        override val descriptor:         MethodDescriptor,
-        target:                          Method
+    override val declaringClassType: ReferenceType,
+    override val name:               String,
+    override val descriptor:         MethodDescriptor,
+    target:                          Method
 ) extends VirtualMethod(declaringClassType, name, descriptor) {
 
     override def toJava: String = declaringClassType.toJava + "{ " + descriptor.toJava(name) + " }"
diff --git a/OPAL/br/src/main/scala/org/opalj/br/analyses/AnalysisException.scala b/OPAL/br/src/main/scala/org/opalj/br/analyses/AnalysisException.scala
index d42af5b45c..4ee0895a6b 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/analyses/AnalysisException.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/analyses/AnalysisException.scala
@@ -9,6 +9,6 @@ package analyses
  * @author Michael Eichberg
  */
 case class AnalysisException(
-        message: String,
-        cause:   Throwable = null
+    message: String,
+    cause:   Throwable = null
 ) extends RuntimeException(message, cause)
diff --git a/OPAL/br/src/main/scala/org/opalj/br/analyses/DeclaredFields.scala b/OPAL/br/src/main/scala/org/opalj/br/analyses/DeclaredFields.scala
index 940c26ac5e..d7585a8647 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/analyses/DeclaredFields.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/analyses/DeclaredFields.scala
@@ -11,13 +11,13 @@ import org.opalj.br.instructions.FieldAccess
 import org.opalj.log.OPALLogger.info
 
 class DeclaredFields(
-        private[this] val project:          SomeProject,
-        private[this] var id2declaredField: Array[DeclaredField],
-        private[this] val declaredInformation2id: ConcurrentHashMap[
-            ObjectType,
-            ConcurrentHashMap[String, ConcurrentHashMap[FieldType, DeclaredField]]
-        ],
-        private[this] val nextId: AtomicInteger
+    private[this] val project:          SomeProject,
+    private[this] var id2declaredField: Array[DeclaredField],
+    private[this] val declaredInformation2id: ConcurrentHashMap[
+        ObjectType,
+        ConcurrentHashMap[String, ConcurrentHashMap[FieldType, DeclaredField]]
+    ],
+    private[this] val nextId: AtomicInteger
 ) {
     private var extensionSize = 1000
     private val rwLock = new ReentrantReadWriteLock()
diff --git a/OPAL/br/src/main/scala/org/opalj/br/analyses/DeclaredMethods.scala b/OPAL/br/src/main/scala/org/opalj/br/analyses/DeclaredMethods.scala
index 709c6e71c7..f3b978addd 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/analyses/DeclaredMethods.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/analyses/DeclaredMethods.scala
@@ -22,13 +22,13 @@ import org.opalj.log.OPALLogger.info
  * @author Dominik Helm
  */
 class DeclaredMethods(
-        private[this] val p: SomeProject,
-        // We need concurrent, mutable maps here, as VirtualDeclaredMethods may be added when they
-        // are queried. This can result in DeclaredMethods added for a type not yet seen, too (e.g.
-        // methods on type Object when not analyzing the JDK.
-        private[this] val data:      ConcurrentHashMap[ReferenceType, ConcurrentHashMap[MethodContext, DeclaredMethod]],
-        private[this] var id2method: Array[DeclaredMethod],
-        private[this] var idCounter: Int
+    private[this] val p: SomeProject,
+    // We need concurrent, mutable maps here, as VirtualDeclaredMethods may be added when they
+    // are queried. This can result in DeclaredMethods added for a type not yet seen, too (e.g.
+    // methods on type Object when not analyzing the JDK.
+    private[this] val data:      ConcurrentHashMap[ReferenceType, ConcurrentHashMap[MethodContext, DeclaredMethod]],
+    private[this] var id2method: Array[DeclaredMethod],
+    private[this] var idCounter: Int
 ) {
 
     private[this] final val lock = new ReentrantReadWriteLock()
diff --git a/OPAL/br/src/main/scala/org/opalj/br/analyses/DeclaredMethodsKey.scala b/OPAL/br/src/main/scala/org/opalj/br/analyses/DeclaredMethodsKey.scala
index d04a3bd182..5572f7f258 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/analyses/DeclaredMethodsKey.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/analyses/DeclaredMethodsKey.scala
@@ -272,8 +272,8 @@ object DeclaredMethodsKey extends ProjectInformationKey[DeclaredMethods, Nothing
      * any `PackagePrivateMethodContext` with the same signature.
      */
     sealed private[analyses] class MethodContext(
-            val methodName: String,
-            val descriptor: MethodDescriptor
+        val methodName: String,
+        val descriptor: MethodDescriptor
     ) {
 
         override def equals(other: Any): Boolean = other match {
@@ -335,9 +335,9 @@ object DeclaredMethodsKey extends ProjectInformationKey[DeclaredMethods, Nothing
      * names are the same, though.
      */
     private[this] class PackagePrivateMethodContext(
-            val packageName: String,
-            methodName:      String,
-            descriptor:      MethodDescriptor
+        val packageName: String,
+        methodName:      String,
+        descriptor:      MethodDescriptor
     ) extends MethodContext(methodName, descriptor) {
 
         override def equals(other: Any): Boolean = other match {
@@ -361,8 +361,8 @@ object DeclaredMethodsKey extends ProjectInformationKey[DeclaredMethods, Nothing
      * `MethodContext` with the same signature regardless of the package name.
      */
     private[this] class ShadowsPackagePrivateMethodContext(
-            methodName: String,
-            descriptor: MethodDescriptor
+        methodName: String,
+        descriptor: MethodDescriptor
     ) extends MethodContext(methodName, descriptor) {
 
         override def equals(other: Any): Boolean = other match {
@@ -381,11 +381,11 @@ object DeclaredMethodsKey extends ProjectInformationKey[DeclaredMethods, Nothing
      * hashCode, but differ in their equality with this type.
      */
     private[analyses] class MethodContextQuery(
-            project:          SomeProject,
-            val receiverType: ObjectType,
-            val packageName:  String,
-            methodName:       String,
-            descriptor:       MethodDescriptor
+        project:          SomeProject,
+        val receiverType: ObjectType,
+        val packageName:  String,
+        methodName:       String,
+        descriptor:       MethodDescriptor
     ) extends MethodContext(methodName, descriptor) {
 
         override def equals(other: Any): Boolean = other match {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/analyses/InconsistentProjectException.scala b/OPAL/br/src/main/scala/org/opalj/br/analyses/InconsistentProjectException.scala
index 78cf73ed4d..30658d4317 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/analyses/InconsistentProjectException.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/analyses/InconsistentProjectException.scala
@@ -12,6 +12,6 @@ import org.opalj.log.Warn
  * @author Michael Eichberg
  */
 case class InconsistentProjectException(
-        message:  String,
-        severity: Level = Warn
+    message:  String,
+    severity: Level = Warn
 ) extends Exception(message)
diff --git a/OPAL/br/src/main/scala/org/opalj/br/analyses/Project.scala b/OPAL/br/src/main/scala/org/opalj/br/analyses/Project.scala
index e81d78aafc..75e640dd9f 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/analyses/Project.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/analyses/Project.scala
@@ -116,46 +116,46 @@ import org.opalj.util.PerformanceEvaluation.time
  * @author Marco Torsello
  */
 class Project[Source] private (
-        private[this] val projectModules:             Map[String, ModuleDefinition[Source]], // just contains "module-info" class files
-        private[this] val projectClassFiles:          Array[ClassFile], // contains no "module-info" class files
-        private[this] val libraryModules:             Map[String, ModuleDefinition[Source]], // just contains "module-info" class files
-        private[this] val libraryClassFiles:          Array[ClassFile],
-        final val libraryClassFilesAreInterfacesOnly: Boolean,
-        private[this] val methodsWithBody:            Array[Method], // methods with bodies sorted by size
-        private[this] val methodsWithBodyAndContext:  Array[MethodInfo[Source]], // the concrete methods, sorted by size in descending order
-        private[this] val projectTypes:               Set[ObjectType], // the types defined by the class files belonging to the project's code
-        private[this] val objectTypeToClassFile:      Map[ObjectType, ClassFile],
-        private[this] val sources:                    Map[ObjectType, Source],
-        final val projectClassFilesCount:             Int,
-        final val projectMethodsCount:                Int,
-        final val projectFieldsCount:                 Int,
-        final val libraryClassFilesCount:             Int,
-        final val libraryMethodsCount:                Int,
-        final val libraryFieldsCount:                 Int,
-        final val codeSize:                           Long,
-        final val MethodHandleSubtypes:               Set[ObjectType],
-        final val VarHandleSubtypes:                  Set[ObjectType],
-        final val classFilesCount:                    Int,
-        final val methodsCount:                       Int,
-        final val fieldsCount:                        Int,
-        final val allProjectClassFiles:               ArraySeq[ClassFile],
-        final val allLibraryClassFiles:               ArraySeq[ClassFile],
-        final val allClassFiles:                      Iterable[ClassFile],
-        final val allMethods:                         Iterable[Method],
-        final val allFields:                          Iterable[Field],
-        final val allSourceElements:                  Iterable[SourceElement],
-        final val virtualMethodsCount:                Int,
-        final val classHierarchy:                     ClassHierarchy,
-        final val instanceMethods:                    Map[ObjectType, ArraySeq[MethodDeclarationContext]],
-        final val overridingMethods:                  Map[Method, immutable.Set[Method]],
-        final val nests:                              Map[ObjectType, ObjectType],
-        // Note that the referenced array will never shrink!
-        @volatile private[this] var projectInformation: AtomicReferenceArray[AnyRef] =
-            new AtomicReferenceArray[AnyRef](32)
+    private[this] val projectModules:             Map[String, ModuleDefinition[Source]], // just contains "module-info" class files
+    private[this] val projectClassFiles:          Array[ClassFile], // contains no "module-info" class files
+    private[this] val libraryModules:             Map[String, ModuleDefinition[Source]], // just contains "module-info" class files
+    private[this] val libraryClassFiles:          Array[ClassFile],
+    final val libraryClassFilesAreInterfacesOnly: Boolean,
+    private[this] val methodsWithBody:            Array[Method], // methods with bodies sorted by size
+    private[this] val methodsWithBodyAndContext:  Array[MethodInfo[Source]], // the concrete methods, sorted by size in descending order
+    private[this] val projectTypes:               Set[ObjectType], // the types defined by the class files belonging to the project's code
+    private[this] val objectTypeToClassFile:      Map[ObjectType, ClassFile],
+    private[this] val sources:                    Map[ObjectType, Source],
+    final val projectClassFilesCount:             Int,
+    final val projectMethodsCount:                Int,
+    final val projectFieldsCount:                 Int,
+    final val libraryClassFilesCount:             Int,
+    final val libraryMethodsCount:                Int,
+    final val libraryFieldsCount:                 Int,
+    final val codeSize:                           Long,
+    final val MethodHandleSubtypes:               Set[ObjectType],
+    final val VarHandleSubtypes:                  Set[ObjectType],
+    final val classFilesCount:                    Int,
+    final val methodsCount:                       Int,
+    final val fieldsCount:                        Int,
+    final val allProjectClassFiles:               ArraySeq[ClassFile],
+    final val allLibraryClassFiles:               ArraySeq[ClassFile],
+    final val allClassFiles:                      Iterable[ClassFile],
+    final val allMethods:                         Iterable[Method],
+    final val allFields:                          Iterable[Field],
+    final val allSourceElements:                  Iterable[SourceElement],
+    final val virtualMethodsCount:                Int,
+    final val classHierarchy:                     ClassHierarchy,
+    final val instanceMethods:                    Map[ObjectType, ArraySeq[MethodDeclarationContext]],
+    final val overridingMethods:                  Map[Method, immutable.Set[Method]],
+    final val nests:                              Map[ObjectType, ObjectType],
+    // Note that the referenced array will never shrink!
+    @volatile private[this] var projectInformation: AtomicReferenceArray[AnyRef] =
+        new AtomicReferenceArray[AnyRef](32)
 )(
-        implicit
-        final val logContext: LogContext,
-        final val config:     Config
+    implicit
+    final val logContext: LogContext,
+    final val config:     Config
 ) extends ProjectLike {
 
     /**
diff --git a/OPAL/br/src/main/scala/org/opalj/br/analyses/ProjectIndex.scala b/OPAL/br/src/main/scala/org/opalj/br/analyses/ProjectIndex.scala
index c0dfc2b646..0976372479 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/analyses/ProjectIndex.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/analyses/ProjectIndex.scala
@@ -24,8 +24,8 @@ import scala.collection.mutable
  * @author Michael Eichberg
  */
 class ProjectIndex private (
-        val fields:  Map[String, Map[FieldType, List[Field]]],
-        val methods: Map[String, Map[MethodDescriptor, List[Method]]]
+    val fields:  Map[String, Map[FieldType, List[Field]]],
+    val methods: Map[String, Map[MethodDescriptor, List[Method]]]
 ) {
 
     def findFields(name: String, fieldType: FieldType): List[Field] = {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/analyses/VirtualFormalParametersKey.scala b/OPAL/br/src/main/scala/org/opalj/br/analyses/VirtualFormalParametersKey.scala
index 4d43ee6d3a..525228bae5 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/analyses/VirtualFormalParametersKey.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/analyses/VirtualFormalParametersKey.scala
@@ -17,7 +17,7 @@ import scala.collection.mutable
  * @author Florian Kuebler
  */
 class VirtualFormalParameters private[analyses] (
-        val data: scala.collection.Map[DeclaredMethod, ArraySeq[VirtualFormalParameter]]
+    val data: scala.collection.Map[DeclaredMethod, ArraySeq[VirtualFormalParameter]]
 ) {
     /**
      * Returns the virtual formal parameters array for the given method. If the method is not known,
diff --git a/OPAL/br/src/main/scala/org/opalj/br/analyses/cg/CallBySignatureKey.scala b/OPAL/br/src/main/scala/org/opalj/br/analyses/cg/CallBySignatureKey.scala
index 38d0e1ea28..126c620bb4 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/analyses/cg/CallBySignatureKey.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/analyses/cg/CallBySignatureKey.scala
@@ -72,7 +72,7 @@ object CallBySignatureKey extends ProjectInformationKey[CallBySignatureTargets,
 }
 
 class CallBySignatureTargets private[analyses] (
-        val data: scala.collection.Map[Method, ArraySeq[ObjectType]]
+    val data: scala.collection.Map[Method, ArraySeq[ObjectType]]
 ) {
     /**
      * Returns all call-by-signature targets of the given method. If the method is not known,
diff --git a/OPAL/br/src/main/scala/org/opalj/br/analyses/cg/EntryPointFinder.scala b/OPAL/br/src/main/scala/org/opalj/br/analyses/cg/EntryPointFinder.scala
index 7be06488b0..97016fb71d 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/analyses/cg/EntryPointFinder.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/analyses/cg/EntryPointFinder.scala
@@ -288,9 +288,9 @@ trait ConfigurationEntryPointsFinder extends EntryPointFinder {
 
     /* Required by Ficus' `ArbitraryTypeReader`*/
     private case class EntryPointContainer(
-            declaringClass: String,
-            name:           String,
-            descriptor:     Option[String]
+        declaringClass: String,
+        name:           String,
+        descriptor:     Option[String]
     )
 }
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/analyses/cg/IsOverridableMethodAnalysis.scala b/OPAL/br/src/main/scala/org/opalj/br/analyses/cg/IsOverridableMethodAnalysis.scala
index cc185fb457..b686194ee1 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/analyses/cg/IsOverridableMethodAnalysis.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/analyses/cg/IsOverridableMethodAnalysis.scala
@@ -24,9 +24,9 @@ import scala.collection.mutable
  * @author Michael Eichberg
  */
 private[analyses] class IsOverridableMethodAnalysis(
-        project:           SomeProject,
-        isClassExtensible: ObjectType => Answer,
-        isTypeExtensible:  ObjectType => Answer
+    project:           SomeProject,
+    isClassExtensible: ObjectType => Answer,
+    isTypeExtensible:  ObjectType => Answer
 ) extends (Method => Answer) {
 
     // private[this] val cache: ConcurrentHashMap[Method, Answer] = new ConcurrentHashMap()
diff --git a/OPAL/br/src/main/scala/org/opalj/br/cfg/BasicBlock.scala b/OPAL/br/src/main/scala/org/opalj/br/cfg/BasicBlock.scala
index 2c1505ac65..09ae436800 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/cfg/BasicBlock.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/cfg/BasicBlock.scala
@@ -15,8 +15,8 @@ package cfg
  */
 // IMPROVE create specialized implementations for the most common cases: (1) just one instruction and just on predecessor, (2) just one predecessor, (3) just one successor
 final class BasicBlock(
-        val startPC:             Int, // <= determines this basic blocks' hash value!
-        private[cfg] var _endPC: Int = Int.MinValue
+    val startPC:             Int, // <= determines this basic blocks' hash value!
+    private[cfg] var _endPC: Int = Int.MinValue
 ) extends CFGNode {
 
     def this(startPC: Int, successors: Set[CFGNode]) = {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/cfg/CFG.scala b/OPAL/br/src/main/scala/org/opalj/br/cfg/CFG.scala
index e3b154770e..957e1b7e79 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/cfg/CFG.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/cfg/CFG.scala
@@ -45,11 +45,11 @@ import org.opalj.log.OPALLogger.info
  * @author Michael Eichberg
  */
 case class CFG[I <: AnyRef, C <: CodeSequence[I]](
-        code:                    C,
-        normalReturnNode:        ExitNode,
-        abnormalReturnNode:      ExitNode,
-        catchNodes:              Seq[CatchNode],
-        private val basicBlocks: Array[BasicBlock]
+    code:                    C,
+    normalReturnNode:        ExitNode,
+    abnormalReturnNode:      ExitNode,
+    catchNodes:              Seq[CatchNode],
+    private val basicBlocks: Array[BasicBlock]
 ) { cfg =>
 
     if (CFG.Validate) {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/cfg/CatchNode.scala b/OPAL/br/src/main/scala/org/opalj/br/cfg/CatchNode.scala
index 2ae60b494d..06bea35e1b 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/cfg/CatchNode.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/cfg/CatchNode.scala
@@ -20,11 +20,11 @@ package cfg
  * @author Michael Eichberg
  */
 final class CatchNode(
-        val index:     Int, // primarily used to compute a unique id
-        val startPC:   Int,
-        val endPC:     Int,
-        val handlerPC: Int,
-        val catchType: Option[ObjectType]
+    val index:     Int, // primarily used to compute a unique id
+    val startPC:   Int,
+    val endPC:     Int,
+    val handlerPC: Int,
+    val catchType: Option[ObjectType]
 ) extends CFGNode {
 
     /**
diff --git a/OPAL/br/src/main/scala/org/opalj/br/collection/immutable/TypesSet.scala b/OPAL/br/src/main/scala/org/opalj/br/collection/immutable/TypesSet.scala
index 6a2ef901b5..95e6735660 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/collection/immutable/TypesSet.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/collection/immutable/TypesSet.scala
@@ -11,8 +11,8 @@ package immutable
  * @author Dominik Helm
  */
 case class TypesSet(
-        final val concreteTypes:   Set[ObjectType],
-        final val upperTypeBounds: Set[ObjectType]
+    final val concreteTypes:   Set[ObjectType],
+    final val upperTypeBounds: Set[ObjectType]
 )(implicit classHierarchy: ClassHierarchy) extends collection.TypesSet {
 
     import classHierarchy.isSubtypeOf
diff --git a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_Dynamic_info.scala b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_Dynamic_info.scala
index 4faa38d6a6..e089c8a516 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_Dynamic_info.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_Dynamic_info.scala
@@ -18,8 +18,8 @@ import org.opalj.bi.ConstantPoolTags
  * @author Dominik Helm
  */
 case class CONSTANT_Dynamic_info(
-        bootstrapMethodAttributeIndex: Int,
-        nameAndTypeIndex:              Constant_Pool_Index
+    bootstrapMethodAttributeIndex: Int,
+    nameAndTypeIndex:              Constant_Pool_Index
 ) extends Constant_Pool_Entry {
 
     override def isDynamic = true
diff --git a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_Fieldref_info.scala b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_Fieldref_info.scala
index 6a9453f40e..63795ecb5c 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_Fieldref_info.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_Fieldref_info.scala
@@ -12,8 +12,8 @@ import org.opalj.bi.ConstantPoolTags
  * @author Andre Pacak
  */
 case class CONSTANT_Fieldref_info(
-        class_index:         Constant_Pool_Index,
-        name_and_type_index: Constant_Pool_Index
+    class_index:         Constant_Pool_Index,
+    name_and_type_index: Constant_Pool_Index
 ) extends Constant_Pool_Entry {
 
     override def tag: Int = ConstantPoolTags.CONSTANT_Fieldref_ID
diff --git a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_InterfaceMethodref_info.scala b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_InterfaceMethodref_info.scala
index 825168f9c7..2418b6554f 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_InterfaceMethodref_info.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_InterfaceMethodref_info.scala
@@ -12,8 +12,8 @@ import org.opalj.bi.ConstantPoolTags
  * @author Andre Pacak
  */
 case class CONSTANT_InterfaceMethodref_info(
-        class_index:         Constant_Pool_Index,
-        name_and_type_index: Constant_Pool_Index
+    class_index:         Constant_Pool_Index,
+    name_and_type_index: Constant_Pool_Index
 ) extends AsMethodref {
 
     override def tag: Int = ConstantPoolTags.CONSTANT_InterfaceMethodref_ID
diff --git a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_InvokeDynamic_info.scala b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_InvokeDynamic_info.scala
index d1ed08d99b..dbcba7101b 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_InvokeDynamic_info.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_InvokeDynamic_info.scala
@@ -19,8 +19,8 @@ import org.opalj.bi.ConstantPoolTags
  * @author Andre Pacak
  */
 case class CONSTANT_InvokeDynamic_info(
-        bootstrapMethodAttributeIndex: Int,
-        nameAndTypeIndex:              Constant_Pool_Index
+    bootstrapMethodAttributeIndex: Int,
+    nameAndTypeIndex:              Constant_Pool_Index
 ) extends Constant_Pool_Entry {
 
     override def asInvokeDynamic: this.type = this
diff --git a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_MethodHandle_info.scala b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_MethodHandle_info.scala
index 49e5085b58..ffbd8b23f2 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_MethodHandle_info.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_MethodHandle_info.scala
@@ -12,8 +12,8 @@ import org.opalj.bi.ConstantPoolTags
  * @author Andre Pacak
  */
 case class CONSTANT_MethodHandle_info(
-        referenceKind:  Int,
-        referenceIndex: Constant_Pool_Index
+    referenceKind:  Int,
+    referenceIndex: Constant_Pool_Index
 ) extends Constant_Pool_Entry {
 
     override def tag: Int = ConstantPoolTags.CONSTANT_MethodHandle_ID
diff --git a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_MethodType_info.scala b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_MethodType_info.scala
index 398f5b62d1..9f2d88da4e 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_MethodType_info.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_MethodType_info.scala
@@ -12,7 +12,7 @@ import org.opalj.bi.ConstantPoolTags
  * @author Andre Pacak
  */
 case class CONSTANT_MethodType_info(
-        descriptorIndex: Constant_Pool_Index
+    descriptorIndex: Constant_Pool_Index
 ) extends Constant_Pool_Entry {
 
     def methodDescriptor(cp: Constant_Pool): MethodDescriptor = {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_Methodref_info.scala b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_Methodref_info.scala
index 424d4fdcbf..42c9def2c2 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_Methodref_info.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_Methodref_info.scala
@@ -12,8 +12,8 @@ import org.opalj.bi.ConstantPoolTags
  * @author Andre Pacak
  */
 case class CONSTANT_Methodref_info(
-        class_index:         Constant_Pool_Index,
-        name_and_type_index: Constant_Pool_Index
+    class_index:         Constant_Pool_Index,
+    name_and_type_index: Constant_Pool_Index
 ) extends AsMethodref {
 
     override final def tag: Int = ConstantPoolTags.CONSTANT_Methodref_ID
diff --git a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_NameAndType_info.scala b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_NameAndType_info.scala
index df330615ef..4ddc4b87f8 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_NameAndType_info.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_NameAndType_info.scala
@@ -13,8 +13,8 @@ import org.opalj.bi.ConstantPoolTags
  * @author Andre Pacak
  */
 case class CONSTANT_NameAndType_info(
-        name_index:       Constant_Pool_Index,
-        descriptor_index: Constant_Pool_Index
+    name_index:       Constant_Pool_Index,
+    descriptor_index: Constant_Pool_Index
 ) extends Constant_Pool_Entry {
 
     override def asNameAndType: this.type = this
diff --git a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_String_info.scala b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_String_info.scala
index 7cdd0878f9..92d232fd66 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_String_info.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/cp/CONSTANT_String_info.scala
@@ -12,7 +12,7 @@ import org.opalj.bi.ConstantPoolTags
  * @author Andre Pacak
  */
 case class CONSTANT_String_info(
-        string_index: Constant_Pool_Index
+    string_index: Constant_Pool_Index
 ) extends CONSTANT_FieldValue_info {
 
     override def tag: Int = ConstantPoolTags.CONSTANT_String_ID
diff --git a/OPAL/br/src/main/scala/org/opalj/br/cp/ConstantsBuffer.scala b/OPAL/br/src/main/scala/org/opalj/br/cp/ConstantsBuffer.scala
index 8d386cf19d..24a2e3ab35 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/cp/ConstantsBuffer.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/cp/ConstantsBuffer.scala
@@ -26,8 +26,8 @@ import org.opalj.br.instructions.LoadString
  * @author  Michael Eichberg
  */
 class ConstantsBuffer private (
-        private var nextIndex:    Int,
-        private val constantPool: mutable.Map[Constant_Pool_Entry, Constant_Pool_Index] // IMPROVE[L3] Use ObjectToIntMap
+    private var nextIndex:    Int,
+    private val constantPool: mutable.Map[Constant_Pool_Entry, Constant_Pool_Index] // IMPROVE[L3] Use ObjectToIntMap
 ) extends ConstantsPoolLike {
 
     private[this] val bootstrapMethods = new BootstrapMethodsBuffer()
diff --git a/OPAL/br/src/main/scala/org/opalj/br/cp/ConstantsPool.scala b/OPAL/br/src/main/scala/org/opalj/br/cp/ConstantsPool.scala
index ee0cdc50d4..6e98781fbc 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/cp/ConstantsPool.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/cp/ConstantsPool.scala
@@ -12,8 +12,8 @@ import scala.collection.immutable
  * @author  Michael Eichberg
  */
 class ConstantsPool(
-        val constantPool:     immutable.Map[Constant_Pool_Entry, Constant_Pool_Index],
-        val bootstrapMethods: IndexedSeq[BootstrapMethod]
+    val constantPool:     immutable.Map[Constant_Pool_Entry, Constant_Pool_Index],
+    val bootstrapMethods: IndexedSeq[BootstrapMethod]
 ) extends ConstantsPoolLike {
 
     private[this] def validateIndex(index: Int, requiresUByteIndex: Boolean): Int = {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/ConfiguredPurity.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/ConfiguredPurity.scala
index b4dbc750c5..69ac020ffd 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/ConfiguredPurity.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/ConfiguredPurity.scala
@@ -19,16 +19,16 @@ import net.ceedubs.ficus.readers.ArbitraryTypeReader._
  * @author Dominik Helm
  */
 class ConfiguredPurity(
-        project:         SomeProject,
-        declaredMethods: DeclaredMethods
+    project:         SomeProject,
+    declaredMethods: DeclaredMethods
 ) {
 
     private case class PurityValue(
-            cf:    String,
-            m:     String,
-            desc:  String,
-            p:     String,
-            conds: Option[Seq[String]]
+        cf:    String,
+        m:     String,
+        desc:  String,
+        p:     String,
+        conds: Option[Seq[String]]
     )
 
     private val classExtensibility = project.get(ClassExtensibilityKey)
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/L0AllocationFreenessAnalysis.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/L0AllocationFreenessAnalysis.scala
index 9c89f717be..a56bf3e9b8 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/L0AllocationFreenessAnalysis.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/L0AllocationFreenessAnalysis.scala
@@ -34,7 +34,7 @@ import org.opalj.fpcf.SomeInterimEP
  * @author Dominik Helm
  */
 class L0AllocationFreenessAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     import project.nonVirtualCall
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/L0SelfReferenceLeakageAnalysis.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/L0SelfReferenceLeakageAnalysis.scala
index 5f44256ddc..be1a470095 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/L0SelfReferenceLeakageAnalysis.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/L0SelfReferenceLeakageAnalysis.scala
@@ -43,8 +43,8 @@ import org.opalj.log.OPALLogger.{debug => trace}
  * @author Michael Eichberg
  */
 class L0SelfReferenceLeakageAnalysis(
-        val project: SomeProject,
-        val debug:   Boolean
+    val project: SomeProject,
+    val debug:   Boolean
 ) extends FPCFAnalysis {
 
     val SelfReferenceLeakageKey = SelfReferenceLeakage.Key
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/L1ThrownExceptionsAnalysis.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/L1ThrownExceptionsAnalysis.scala
index 460d4f1333..ffd6d87ac4 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/L1ThrownExceptionsAnalysis.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/L1ThrownExceptionsAnalysis.scala
@@ -77,7 +77,7 @@ import org.opalj.fpcf.UBP
  * @author Andreas Muttscheller
  */
 class L1ThrownExceptionsAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     private[analyses] def lazilyDetermineThrownExceptions(
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualMethodAllocationFreenessAnalysis.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualMethodAllocationFreenessAnalysis.scala
index 44bd3c84e5..5cf04fccf3 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualMethodAllocationFreenessAnalysis.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualMethodAllocationFreenessAnalysis.scala
@@ -30,7 +30,7 @@ import org.opalj.fpcf.SomeEPS
  * @author Dominik Helm
  */
 class VirtualMethodAllocationFreenessAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     private[this] val declaredMethods = project.get(DeclaredMethodsKey)
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualMethodStaticDataUsageAnalysis.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualMethodStaticDataUsageAnalysis.scala
index bcea5f1d82..b15755ffe7 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualMethodStaticDataUsageAnalysis.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualMethodStaticDataUsageAnalysis.scala
@@ -32,7 +32,7 @@ import org.opalj.fpcf.SomeEPS
  * @author Dominik Helm
  */
 class VirtualMethodStaticDataUsageAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
     private[this] val declaredMethods = project.get(DeclaredMethodsKey)
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualMethodThrownExceptionsAnalysis.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualMethodThrownExceptionsAnalysis.scala
index 163b009fdd..3abac1e94d 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualMethodThrownExceptionsAnalysis.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualMethodThrownExceptionsAnalysis.scala
@@ -38,7 +38,7 @@ import org.opalj.fpcf.UBP
  * @author Michael Eichberg
  */
 class VirtualMethodThrownExceptionsAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     private[analyses] def lazilyAggregateExceptionsThrownByOverridingMethods(
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualReturnValueFreshnessAnalysis.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualReturnValueFreshnessAnalysis.scala
index 1ffc250b63..40c6b863b5 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualReturnValueFreshnessAnalysis.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/analyses/VirtualReturnValueFreshnessAnalysis.scala
@@ -34,7 +34,7 @@ import org.opalj.fpcf.UBP
  * @author Florian Kübler
  */
 class VirtualReturnValueFreshnessAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     private[this] val declaredMethods: DeclaredMethods = project.get(DeclaredMethodsKey)
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/Context.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/Context.scala
index aad97e3730..532e3bde52 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/Context.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/Context.scala
@@ -111,9 +111,9 @@ class SimpleContexts private[properties] (declaredMethods: DeclaredMethods) {
  * A context that includes a call string
  */
 class CallStringContext private[properties] (
-        val id:         Int,
-        val method:     DeclaredMethod,
-        val callString: List[(DeclaredMethod, Int)]
+    val id:         Int,
+    val method:     DeclaredMethod,
+    val callString: List[(DeclaredMethod, Int)]
 ) extends Context {
     override def toString: String = {
         s"CallStringContext($method, $callString)"
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/MethodComplexity.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/MethodComplexity.scala
index 0a9bc50b63..e3a45bbb24 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/MethodComplexity.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/MethodComplexity.scala
@@ -50,7 +50,7 @@ sealed trait MethodComplexityPropertyMetaInformation extends PropertyMetaInforma
  * @author Michael Eichberg
  */
 case class MethodComplexity(
-        value: Int
+    value: Int
 ) extends Property
     with MethodComplexityPropertyMetaInformation {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/ThrownExceptions.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/ThrownExceptions.scala
index 47efa05d58..ad62db34d8 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/ThrownExceptions.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/ThrownExceptions.scala
@@ -47,7 +47,7 @@ sealed trait ThrownExceptionsPropertyMetaInformation extends PropertyMetaInforma
  * @author Michael Eichberg
  */
 case class ThrownExceptions(
-        types: BRTypesSet
+    types: BRTypesSet
 ) extends Property
     with ThrownExceptionsPropertyMetaInformation {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/ThrownExceptionsByOverridingMethods.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/ThrownExceptionsByOverridingMethods.scala
index 88d140185e..84cd147277 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/ThrownExceptionsByOverridingMethods.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/ThrownExceptionsByOverridingMethods.scala
@@ -61,7 +61,7 @@ object ThrownExceptionsByOverridingMethods
 }
 
 case class ThrownExceptionsByOverridingMethods(
-        exceptions: BRTypesSet = BRTypesSet.empty
+    exceptions: BRTypesSet = BRTypesSet.empty
 ) extends Property
     with ThrownExceptionsByOverridingMethodsPropertyMetaInformation {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodAllocationFreeness.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodAllocationFreeness.scala
index 8b7a911aba..147495e604 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodAllocationFreeness.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodAllocationFreeness.scala
@@ -20,7 +20,7 @@ sealed trait VirtualMethodAllocationFreenessPropertyMetaInformation
  * @author Dominik Helm
  */
 sealed case class VirtualMethodAllocationFreeness(
-        individualProperty: AllocationFreeness
+    individualProperty: AllocationFreeness
 ) extends AggregatedProperty[AllocationFreeness, VirtualMethodAllocationFreeness]
     with VirtualMethodAllocationFreenessPropertyMetaInformation {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodEscapeProperty.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodEscapeProperty.scala
index a9aec8faa8..00cffff7e4 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodEscapeProperty.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodEscapeProperty.scala
@@ -13,7 +13,7 @@ sealed trait VirtualMethodEscapePropertyMetaInformation extends PropertyMetaInfo
 }
 
 sealed case class VirtualMethodEscapeProperty(
-        escapeProperty: EscapeProperty
+    escapeProperty: EscapeProperty
 ) extends Property with VirtualMethodEscapePropertyMetaInformation {
     final def key: PropertyKey[VirtualMethodEscapeProperty] = VirtualMethodEscapeProperty.key
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodPurity.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodPurity.scala
index 460b20ace8..b4cae58254 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodPurity.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodPurity.scala
@@ -19,7 +19,7 @@ sealed trait VirtualMethodPurityPropertyMetaInformation extends PropertyMetaInfo
  * @author Dominik Helm
  */
 sealed case class VirtualMethodPurity(
-        individualProperty: Purity
+    individualProperty: Purity
 ) extends AggregatedProperty[Purity, VirtualMethodPurity]
     with VirtualMethodPurityPropertyMetaInformation {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodStaticDataUsage.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodStaticDataUsage.scala
index 572f61c9ec..bdaa164be6 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodStaticDataUsage.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/VirtualMethodStaticDataUsage.scala
@@ -19,7 +19,7 @@ sealed trait VirtualMethodStaticDataUsagePropertyMetaInformation extends Propert
  * @author Dominik Helm
  */
 sealed case class VirtualMethodStaticDataUsage(
-        individualProperty: StaticDataUsage
+    individualProperty: StaticDataUsage
 ) extends AggregatedProperty[StaticDataUsage, VirtualMethodStaticDataUsage]
     with VirtualMethodStaticDataUsagePropertyMetaInformation {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/Callees.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/Callees.scala
index 3255e27e4c..02e390afbb 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/Callees.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/Callees.scala
@@ -192,11 +192,11 @@ sealed trait Callees extends Property with CalleesPropertyMetaInformation {
  * Callees class used for final results where the callees are already aggregated.
  */
 sealed class ConcreteCallees(
-        private[this] val directCalleesIds:        IntMap[IntMap[IntTrieSet]], // Caller Context => PC => Callees
-        private[this] val indirectCalleesIds:      IntMap[IntMap[IntTrieSet]], // Caller Context => PC => Callees
-        private[this] val _incompleteCallSites:    IntMap[br.PCs], // Caller Context => PCs
-        private[this] val _indirectCallReceivers:  IntMap[IntMap[IntMap[Option[(ValueInformation, br.PCs)]]]], // Caller Context => PC => Callee => Receiver
-        private[this] val _indirectCallParameters: IntMap[IntMap[IntMap[Seq[Option[(ValueInformation, br.PCs)]]]]] // Caller Context => PC => Callee => Parameters
+    private[this] val directCalleesIds:        IntMap[IntMap[IntTrieSet]], // Caller Context => PC => Callees
+    private[this] val indirectCalleesIds:      IntMap[IntMap[IntTrieSet]], // Caller Context => PC => Callees
+    private[this] val _incompleteCallSites:    IntMap[br.PCs], // Caller Context => PCs
+    private[this] val _indirectCallReceivers:  IntMap[IntMap[IntMap[Option[(ValueInformation, br.PCs)]]]], // Caller Context => PC => Callee => Receiver
+    private[this] val _indirectCallParameters: IntMap[IntMap[IntMap[Seq[Option[(ValueInformation, br.PCs)]]]]] // Caller Context => PC => Callee => Parameters
 ) extends Callees {
 
     override def incompleteCallSites(callerContext: Context)(implicit propertyStore: PropertyStore): IntIterator = {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/Callers.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/Callers.scala
index a37a7de7f2..05634db918 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/Callers.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/Callers.scala
@@ -300,8 +300,8 @@ sealed trait CallersImplementation extends Callers {
 }
 
 class CallersOnlyWithConcreteCallers(
-        val encodedCallers: IntMap[LongLinkedSet] /* Callee Context => Caller Context + PC + isDirect */,
-        val size:           Int
+    val encodedCallers: IntMap[LongLinkedSet] /* Callee Context => Caller Context + PC + isDirect */,
+    val size:           Int
 ) extends CallersImplementation with CallersWithoutVMLevelCall with CallersWithoutUnknownContext {
 
     override def updated(
@@ -346,9 +346,9 @@ class CallersOnlyWithConcreteCallers(
 }
 
 class CallersImplWithOtherCalls(
-        val encodedCallers:                IntMap[LongLinkedSet] /* Callee Context => Caller Context + PC + isDirect */,
-        val size:                          Int,
-        private val specialCallSitesFlags: Byte // last bit vm lvl, second last bit unknown context
+    val encodedCallers:                IntMap[LongLinkedSet] /* Callee Context => Caller Context + PC + isDirect */,
+    val size:                          Int,
+    private val specialCallSitesFlags: Byte // last bit vm lvl, second last bit unknown context
 ) extends CallersImplementation {
     assert(encodedCallers.nonEmpty)
     assert(specialCallSitesFlags >= 0 && specialCallSitesFlags <= 3)
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/ForNameClasses.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/ForNameClasses.scala
index a56d4157aa..6f7337bd3b 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/ForNameClasses.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/ForNameClasses.scala
@@ -25,8 +25,8 @@ sealed trait ForNameClassesMetaInformation extends PropertyMetaInformation {
  * @author Dominik Helm
  */
 sealed class ForNameClasses private[properties] (
-        final val orderedClasses: List[ReferenceType],
-        final val classes:        UIDSet[ReferenceType]
+    final val orderedClasses: List[ReferenceType],
+    final val classes:        UIDSet[ReferenceType]
 ) extends OrderedProperty with ForNameClassesMetaInformation {
 
     assert(orderedClasses == null || orderedClasses.size == classes.size)
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/InstantiatedTypes.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/InstantiatedTypes.scala
index 38b5518b0a..8f3c167d8b 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/InstantiatedTypes.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/InstantiatedTypes.scala
@@ -31,8 +31,8 @@ sealed trait InstantiatedTypesPropertyMetaInformation extends PropertyMetaInform
 }
 
 case class InstantiatedTypes private[properties] (
-        private val orderedTypes: List[ReferenceType],
-        types:                    UIDSet[ReferenceType]
+    private val orderedTypes: List[ReferenceType],
+    types:                    UIDSet[ReferenceType]
 ) extends OrderedProperty
     with InstantiatedTypesPropertyMetaInformation {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/LoadedClasses.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/LoadedClasses.scala
index 3072c9aa56..ca4a57fb20 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/LoadedClasses.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/LoadedClasses.scala
@@ -26,8 +26,8 @@ sealed trait LoadedClassesMetaInformation extends PropertyMetaInformation {
  * @author Florian Kuebler
  */
 sealed class LoadedClasses private[properties] (
-        final val orderedClasses: List[ObjectType],
-        final val classes:        UIDSet[ObjectType]
+    final val orderedClasses: List[ObjectType],
+    final val classes:        UIDSet[ObjectType]
 ) extends OrderedProperty with LoadedClassesMetaInformation {
 
     assert(orderedClasses == null || orderedClasses.size == classes.size)
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/fieldaccess/FieldAccessInformation.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/fieldaccess/FieldAccessInformation.scala
index 162aaa84f7..299428e5b4 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/fieldaccess/FieldAccessInformation.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/fieldaccess/FieldAccessInformation.scala
@@ -184,10 +184,10 @@ sealed trait FieldAccessInformation[S <: FieldAccessInformation[S]] extends Orde
 }
 
 case class FieldReadAccessInformation(
-        protected val encodedDirectAccesses:          LongLinkedSet,
-        protected val encodedDirectAccessReceivers:   LongMap[AccessReceiver],
-        protected val encodedIndirectAccesses:        LongLinkedSet,
-        protected val encodedIndirectAccessReceivers: LongMap[AccessReceiver]
+    protected val encodedDirectAccesses:          LongLinkedSet,
+    protected val encodedDirectAccessReceivers:   LongMap[AccessReceiver],
+    protected val encodedIndirectAccesses:        LongLinkedSet,
+    protected val encodedIndirectAccessReceivers: LongMap[AccessReceiver]
 ) extends FieldAccessInformation[FieldReadAccessInformation]
     with FieldAccessInformationPropertyMetaInformation[FieldReadAccessInformation] {
 
@@ -216,12 +216,12 @@ case class FieldReadAccessInformation(
 }
 
 case class FieldWriteAccessInformation(
-        protected val encodedDirectAccesses:                 LongLinkedSet,
-        protected[this] val encodedDirectAccessReceivers:    LongMap[AccessReceiver],
-        protected[this] val encodedDirectAccessParameters:   LongMap[AccessParameter],
-        protected val encodedIndirectAccesses:               LongLinkedSet,
-        protected[this] val encodedIndirectAccessReceivers:  LongMap[AccessReceiver],
-        protected[this] val encodedIndirectAccessParameters: LongMap[AccessParameter]
+    protected val encodedDirectAccesses:                 LongLinkedSet,
+    protected[this] val encodedDirectAccessReceivers:    LongMap[AccessReceiver],
+    protected[this] val encodedDirectAccessParameters:   LongMap[AccessParameter],
+    protected val encodedIndirectAccesses:               LongLinkedSet,
+    protected[this] val encodedIndirectAccessReceivers:  LongMap[AccessReceiver],
+    protected[this] val encodedIndirectAccessParameters: LongMap[AccessParameter]
 ) extends FieldAccessInformation[FieldWriteAccessInformation]
     with FieldAccessInformationPropertyMetaInformation[FieldWriteAccessInformation] {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/fieldaccess/MethodFieldAccessInformation.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/fieldaccess/MethodFieldAccessInformation.scala
index fd52b43284..cee20b4e0a 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/fieldaccess/MethodFieldAccessInformation.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/fieldaccess/MethodFieldAccessInformation.scala
@@ -206,11 +206,11 @@ sealed trait MethodFieldAccessInformation[S <: MethodFieldAccessInformation[S]]
 }
 
 case class MethodFieldReadAccessInformation(
-        protected val _incompleteAccessSites:            IntMap[PCs],
-        protected val _directAccessedFields:             IntMap[IntMap[IntList]],
-        protected val _directAccessedReceiversByField:   IntMap[IntMap[IntMap[AccessReceiver]]],
-        protected val _indirectAccessedFields:           IntMap[IntMap[IntList]],
-        protected val _indirectAccessedReceiversByField: IntMap[IntMap[IntMap[AccessReceiver]]]
+    protected val _incompleteAccessSites:            IntMap[PCs],
+    protected val _directAccessedFields:             IntMap[IntMap[IntList]],
+    protected val _directAccessedReceiversByField:   IntMap[IntMap[IntMap[AccessReceiver]]],
+    protected val _indirectAccessedFields:           IntMap[IntMap[IntList]],
+    protected val _indirectAccessedReceiversByField: IntMap[IntMap[IntMap[AccessReceiver]]]
 ) extends MethodFieldAccessInformation[MethodFieldReadAccessInformation]
     with MethodFieldAccessInformationPropertyMetaInformation[MethodFieldReadAccessInformation] {
 
@@ -252,13 +252,13 @@ case class MethodFieldReadAccessInformation(
 }
 
 case class MethodFieldWriteAccessInformation(
-        protected val _incompleteAccessSites:             IntMap[PCs],
-        protected val _directAccessedFields:              IntMap[IntMap[IntList]],
-        protected val _directAccessedReceiversByField:    IntMap[IntMap[IntMap[AccessReceiver]]],
-        protected val _directAccessedParametersByField:   IntMap[IntMap[IntMap[AccessParameter]]],
-        protected val _indirectAccessedFields:            IntMap[IntMap[IntList]],
-        protected val _indirectAccessedReceiversByField:  IntMap[IntMap[IntMap[AccessReceiver]]],
-        protected val _indirectAccessedParametersByField: IntMap[IntMap[IntMap[AccessParameter]]]
+    protected val _incompleteAccessSites:             IntMap[PCs],
+    protected val _directAccessedFields:              IntMap[IntMap[IntList]],
+    protected val _directAccessedReceiversByField:    IntMap[IntMap[IntMap[AccessReceiver]]],
+    protected val _directAccessedParametersByField:   IntMap[IntMap[IntMap[AccessParameter]]],
+    protected val _indirectAccessedFields:            IntMap[IntMap[IntList]],
+    protected val _indirectAccessedReceiversByField:  IntMap[IntMap[IntMap[AccessReceiver]]],
+    protected val _indirectAccessedParametersByField: IntMap[IntMap[IntMap[AccessParameter]]]
 ) extends MethodFieldAccessInformation[MethodFieldWriteAccessInformation]
     with MethodFieldAccessInformationPropertyMetaInformation[MethodFieldWriteAccessInformation] {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/pointsto/AllocationSitePointsToSet.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/pointsto/AllocationSitePointsToSet.scala
index d06ec3ac2e..bc731eb34e 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/pointsto/AllocationSitePointsToSet.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/pointsto/AllocationSitePointsToSet.scala
@@ -235,9 +235,9 @@ object AllocationSitePointsToSet extends AllocationSitePointsToSetPropertyMetaIn
 }
 
 case class AllocationSitePointsToSetN private[pointsto] (
-        override val elements:                     LongLinkedSet,
-        override val types:                        UIDSet[ReferenceType],
-        override protected[this] val orderedTypes: List[ReferenceType]
+    override val elements:                     LongLinkedSet,
+    override val types:                        UIDSet[ReferenceType],
+    override protected[this] val orderedTypes: List[ReferenceType]
 ) extends AllocationSitePointsToSet {
 
     override def numTypes: Int = types.size
@@ -317,8 +317,8 @@ object NoAllocationSites extends AllocationSitePointsToSet {
 }
 
 case class AllocationSitePointsToSet1(
-        allocationSite: AllocationSite,
-        allocatedType:  ReferenceType
+    allocationSite: AllocationSite,
+    allocatedType:  ReferenceType
 ) extends AllocationSitePointsToSet {
 
     override def numTypes: Int = 1
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/pointsto/TypeBasedPointsToSet.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/pointsto/TypeBasedPointsToSet.scala
index ac65088a57..602885aa83 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/pointsto/TypeBasedPointsToSet.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/pointsto/TypeBasedPointsToSet.scala
@@ -25,8 +25,8 @@ sealed trait TypeBasedPointsToSetPropertyMetaInformation extends PropertyMetaInf
 }
 
 case class TypeBasedPointsToSet private[properties] (
-        private val orderedTypes: List[ReferenceType],
-        override val types:       UIDSet[ReferenceType]
+    private val orderedTypes: List[ReferenceType],
+    override val types:       UIDSet[ReferenceType]
 ) extends PointsToSetLike[ReferenceType, UIDSet[ReferenceType], TypeBasedPointsToSet]
     with OrderedProperty
     with TypeBasedPointsToSetPropertyMetaInformation {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/BranchoffsetOutOfBoundsException.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/BranchoffsetOutOfBoundsException.scala
index 94f9a2f364..16d6a90fe1 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/BranchoffsetOutOfBoundsException.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/BranchoffsetOutOfBoundsException.scala
@@ -4,7 +4,7 @@ package br
 package instructions
 
 case class BranchoffsetOutOfBoundsException(
-        labeledInstruction: LabeledInstruction
+    labeledInstruction: LabeledInstruction
 ) extends RuntimeException(
         s"resolving the branchoffset of $labeledInstruction resulted in an invalid branchoffset"
     )
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/CHECKCAST.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/CHECKCAST.scala
index daa980db09..80a32f7c2e 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/CHECKCAST.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/CHECKCAST.scala
@@ -9,7 +9,7 @@ package instructions
  * @author Michael Eichberg
  */
 case class CHECKCAST(
-        referenceType: ReferenceType
+    referenceType: ReferenceType
 ) extends Instruction with ConstantLengthInstruction with NoLabels {
 
     override final def isCheckcast: Boolean = true
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/GETFIELD.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/GETFIELD.scala
index eba22eb81d..f4893f9004 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/GETFIELD.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/GETFIELD.scala
@@ -20,9 +20,9 @@ package instructions
  * @author Michael Eichberg
  */
 case class GETFIELD(
-        declaringClass: ObjectType,
-        name:           String,
-        fieldType:      FieldType
+    declaringClass: ObjectType,
+    name:           String,
+    fieldType:      FieldType
 ) extends FieldReadAccess {
 
     final def opcode: Opcode = GETFIELD.opcode
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/GETSTATIC.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/GETSTATIC.scala
index e327d7e9c6..f640595111 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/GETSTATIC.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/GETSTATIC.scala
@@ -11,9 +11,9 @@ package instructions
  * @author Michael Eichberg
  */
 case class GETSTATIC(
-        declaringClass: ObjectType,
-        name:           String,
-        fieldType:      FieldType
+    declaringClass: ObjectType,
+    name:           String,
+    fieldType:      FieldType
 ) extends FieldReadAccess {
 
     final def opcode: Opcode = GETSTATIC.opcode
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/GOTO.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/GOTO.scala
index 87113f8d0f..fe46b55cfd 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/GOTO.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/GOTO.scala
@@ -43,7 +43,7 @@ object GOTO extends InstructionMetaInformation {
 }
 
 case class LabeledGOTO(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledUnconditionalBranchInstruction with GOTOLike {
 
     @throws[BranchoffsetOutOfBoundsException]("if the branchoffset is invalid")
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/GOTO_W.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/GOTO_W.scala
index 5432eb2222..6e9dd10ef2 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/GOTO_W.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/GOTO_W.scala
@@ -43,7 +43,7 @@ object GOTO_W extends InstructionMetaInformation {
 }
 
 case class LabeledGOTO_W(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledUnconditionalBranchInstruction with GOTO_WLike {
 
     override def resolveJumpTargets(currentPC: PC, pcs: Map[InstructionLabel, PC]): GOTO_W = {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFEQ.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFEQ.scala
index 3e8645f6fd..acb9c7784a 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFEQ.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFEQ.scala
@@ -50,7 +50,7 @@ object IFEQ extends InstructionMetaInformation {
 }
 
 case class LabeledIFEQ(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IFEQLike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFGE.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFGE.scala
index b03e150aa9..2cee54e12d 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFGE.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFGE.scala
@@ -50,7 +50,7 @@ object IFGE extends InstructionMetaInformation {
 }
 
 case class LabeledIFGE(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IFGELike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFGT.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFGT.scala
index 7a3881f762..0dc5d61b82 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFGT.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFGT.scala
@@ -49,7 +49,7 @@ object IFGT extends InstructionMetaInformation {
 }
 
 case class LabeledIFGT(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IFGTLike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFLE.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFLE.scala
index 4671aaece2..44b9551d43 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFLE.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFLE.scala
@@ -50,7 +50,7 @@ object IFLE extends InstructionMetaInformation {
 }
 
 case class LabeledIFLE(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IFLELike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFLT.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFLT.scala
index 47cfef3b26..aed75fb9e1 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFLT.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFLT.scala
@@ -48,7 +48,7 @@ object IFLT extends InstructionMetaInformation {
 }
 
 case class LabeledIFLT(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IFLTLike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFNE.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFNE.scala
index 0647d51cf2..b9505f6c11 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFNE.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFNE.scala
@@ -49,7 +49,7 @@ object IFNE extends InstructionMetaInformation {
 }
 
 case class LabeledIFNE(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IFNELike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFNONNULL.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFNONNULL.scala
index 602d26929f..b54cdc3a82 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFNONNULL.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFNONNULL.scala
@@ -49,7 +49,7 @@ object IFNONNULL extends InstructionMetaInformation {
 }
 
 case class LabeledIFNONNULL(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IFNONNULLLike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFNULL.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFNULL.scala
index c9fe9b08bc..f2c151c7aa 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IFNULL.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IFNULL.scala
@@ -50,7 +50,7 @@ object IFNULL extends InstructionMetaInformation {
 }
 
 case class LabeledIFNULL(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IFNULLLike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ACMPEQ.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ACMPEQ.scala
index 144319372f..6e4f39c4d1 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ACMPEQ.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ACMPEQ.scala
@@ -50,7 +50,7 @@ object IF_ACMPEQ extends InstructionMetaInformation {
 }
 
 case class LabeledIF_ACMPEQ(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IF_ACMPEQLike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ACMPNE.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ACMPNE.scala
index 143dd29789..4a8686764f 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ACMPNE.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ACMPNE.scala
@@ -50,7 +50,7 @@ object IF_ACMPNE extends InstructionMetaInformation {
 }
 
 case class LabeledIF_ACMPNE(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IF_ACMPNELike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPEQ.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPEQ.scala
index 9ae1bfa570..d88abb7c5f 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPEQ.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPEQ.scala
@@ -50,7 +50,7 @@ object IF_ICMPEQ extends InstructionMetaInformation {
 }
 
 case class LabeledIF_ICMPEQ(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IF_ICMPEQLike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPGE.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPGE.scala
index 382055cc74..edad25d56f 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPGE.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPGE.scala
@@ -45,7 +45,7 @@ object IF_ICMPGE extends InstructionMetaInformation {
 }
 
 case class LabeledIF_ICMPGE(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IF_ICMPGELike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPGT.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPGT.scala
index 1aeb17b1aa..0403699bc2 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPGT.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPGT.scala
@@ -50,7 +50,7 @@ object IF_ICMPGT extends InstructionMetaInformation {
 }
 
 case class LabeledIF_ICMPGT(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IF_ICMPGTLike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPLE.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPLE.scala
index 295514c076..c293e35f1b 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPLE.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPLE.scala
@@ -50,7 +50,7 @@ object IF_ICMPLE extends InstructionMetaInformation {
 }
 
 case class LabeledIF_ICMPLE(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IF_ICMPLELike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPLT.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPLT.scala
index ef65234540..f43eece4df 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPLT.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPLT.scala
@@ -50,7 +50,7 @@ object IF_ICMPLT extends InstructionMetaInformation {
 }
 
 case class LabeledIF_ICMPLT(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IF_ICMPLTLike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPNE.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPNE.scala
index 2aeb24addd..0ea7f82c02 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPNE.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/IF_ICMPNE.scala
@@ -50,7 +50,7 @@ object IF_ICMPNE extends InstructionMetaInformation {
 }
 
 case class LabeledIF_ICMPNE(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledSimpleConditionalBranchInstruction
     with IF_ICMPNELike {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/INSTANCEOF.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/INSTANCEOF.scala
index abf4dbf349..2f0b57c7c9 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/INSTANCEOF.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/INSTANCEOF.scala
@@ -9,7 +9,7 @@ package instructions
  * @author Michael Eichberg
  */
 case class INSTANCEOF(
-        referenceType: ReferenceType
+    referenceType: ReferenceType
 ) extends ConstantLengthInstruction with NoLabels {
 
     final def opcode: Opcode = INSTANCEOF.opcode
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKEDYNAMIC.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKEDYNAMIC.scala
index b93920728c..8422bd1e07 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKEDYNAMIC.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKEDYNAMIC.scala
@@ -87,9 +87,9 @@ case object INCOMPLETE_INVOKEDYNAMIC extends INVOKEDYNAMIC {
  * @author Arne Lottmann
  */
 case class DEFAULT_INVOKEDYNAMIC(
-        bootstrapMethod:  BootstrapMethod,
-        name:             String,
-        methodDescriptor: MethodDescriptor
+    bootstrapMethod:  BootstrapMethod,
+    name:             String,
+    methodDescriptor: MethodDescriptor
 ) extends INVOKEDYNAMIC {
 
     override def toString: String = {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKEINTERFACE.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKEINTERFACE.scala
index 11105131a9..039e7ae75a 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKEINTERFACE.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKEINTERFACE.scala
@@ -9,9 +9,9 @@ package instructions
  * @author Michael Eichberg
  */
 case class INVOKEINTERFACE(
-        override val declaringClass:   ObjectType, // an interface type
-        override val name:             String,
-        override val methodDescriptor: MethodDescriptor
+    override val declaringClass:   ObjectType, // an interface type
+    override val name:             String,
+    override val methodDescriptor: MethodDescriptor
 ) extends VirtualMethodInvocationInstruction {
 
     override final def isInterfaceCall: Boolean = true
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKESPECIAL.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKESPECIAL.scala
index 5231aeeebb..6ab5ddff7b 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKESPECIAL.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKESPECIAL.scala
@@ -10,10 +10,10 @@ package instructions
  * @author Michael Eichberg
  */
 case class INVOKESPECIAL(
-        declaringClass:   ObjectType, // an interface or class type to be precise
-        isInterface:      Boolean,
-        name:             String, // an interface or class type to be precise
-        methodDescriptor: MethodDescriptor
+    declaringClass:   ObjectType, // an interface or class type to be precise
+    isInterface:      Boolean,
+    name:             String, // an interface or class type to be precise
+    methodDescriptor: MethodDescriptor
 ) extends NonVirtualMethodInvocationInstruction {
 
     final def isInterfaceCall: Boolean = isInterface
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKESTATIC.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKESTATIC.scala
index dfad6d6667..ca51e3f90f 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKESTATIC.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKESTATIC.scala
@@ -9,10 +9,10 @@ package instructions
  * @author Michael Eichberg
  */
 case class INVOKESTATIC(
-        declaringClass:   ObjectType, // a class or interface (Java 8) type
-        isInterface:      Boolean,
-        name:             String,
-        methodDescriptor: MethodDescriptor
+    declaringClass:   ObjectType, // a class or interface (Java 8) type
+    isInterface:      Boolean,
+    name:             String,
+    methodDescriptor: MethodDescriptor
 ) extends NonVirtualMethodInvocationInstruction {
 
     override final def isInvokeStatic: Boolean = true
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKEVIRTUAL.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKEVIRTUAL.scala
index 85fae6b5b6..9559d00a31 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKEVIRTUAL.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/INVOKEVIRTUAL.scala
@@ -9,9 +9,9 @@ package instructions
  * @author Michael Eichberg
  */
 case class INVOKEVIRTUAL(
-        declaringClass:   ReferenceType, // an class or array type to be precise
-        name:             String,
-        methodDescriptor: MethodDescriptor
+    declaringClass:   ReferenceType, // an class or array type to be precise
+    name:             String,
+    methodDescriptor: MethodDescriptor
 ) extends VirtualMethodInvocationInstruction {
 
     final def isInterfaceCall: Boolean = false
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/JSR.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/JSR.scala
index 6fe6bcf73d..78e7f3c20e 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/JSR.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/JSR.scala
@@ -40,7 +40,7 @@ object JSR extends InstructionMetaInformation {
 }
 
 case class LabeledJSR(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledUnconditionalBranchInstruction with JSRLike {
 
     @throws[BranchoffsetOutOfBoundsException]("if the branchoffset is invalid")
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/JSR_W.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/JSR_W.scala
index a402b58dac..fe9bd9a220 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/JSR_W.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/JSR_W.scala
@@ -41,7 +41,7 @@ object JSR_W extends InstructionMetaInformation {
 }
 
 case class LabeledJSR_W(
-        branchTarget: InstructionLabel
+    branchTarget: InstructionLabel
 ) extends LabeledUnconditionalBranchInstruction with JSR_WLike {
 
     override def resolveJumpTargets(currentPC: PC, pcs: Map[InstructionLabel, PC]): JSR_W = {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/LDC.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/LDC.scala
index 867041da3e..e922baa300 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/LDC.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/LDC.scala
@@ -112,9 +112,9 @@ final case class LoadString(value: String) extends PrimitiveLDC[String] {
  *       [[LDCDynamic]].
  */
 final case class LoadDynamic(
-        bootstrapMethod: BootstrapMethod,
-        name:            String,
-        descriptor:      FieldType
+    bootstrapMethod: BootstrapMethod,
+    name:            String,
+    descriptor:      FieldType
 ) extends LDC[Nothing] {
     def value: Nothing = throw new UnsupportedOperationException("dynamic constant unknown")
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/LDC2_W.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/LDC2_W.scala
index a1c14b2647..e5cca25a85 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/LDC2_W.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/LDC2_W.scala
@@ -73,9 +73,9 @@ final case class LoadDouble(value: Double) extends LDC2_W[Double] {
  *       [[LDCDynamic]].
  */
 final case class LoadDynamic2_W(
-        bootstrapMethod: BootstrapMethod,
-        name:            String,
-        descriptor:      FieldType
+    bootstrapMethod: BootstrapMethod,
+    name:            String,
+    descriptor:      FieldType
 ) extends LDC2_W[Nothing] {
     def value: Nothing = throw new UnsupportedOperationException("dynamic constant unknown")
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/LDC_W.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/LDC_W.scala
index f9e342a74a..f2ca32e6e1 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/LDC_W.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/LDC_W.scala
@@ -88,9 +88,9 @@ final case class LoadString_W(value: String) extends PrimitiveLDC_W[String] {
  *       [[LDCDynamic]].
  */
 final case class LoadDynamic_W(
-        bootstrapMethod: BootstrapMethod,
-        name:            String,
-        descriptor:      FieldType
+    bootstrapMethod: BootstrapMethod,
+    name:            String,
+    descriptor:      FieldType
 ) extends LDC_W[Nothing] {
     def value: Nothing = throw new UnsupportedOperationException("dynamic constant unknown")
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/LOOKUPSWITCH.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/LOOKUPSWITCH.scala
index 9a020a44b9..964f2384e2 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/LOOKUPSWITCH.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/LOOKUPSWITCH.scala
@@ -40,8 +40,8 @@ trait LOOKUPSWITCHLike extends CompoundConditionalBranchInstructionLike {
  * @author  Michael Eichberg
  */
 case class LOOKUPSWITCH(
-        defaultOffset: Int,
-        npairs:        ArraySeq[IntIntPair]
+    defaultOffset: Int,
+    npairs:        ArraySeq[IntIntPair]
 ) extends CompoundConditionalBranchInstruction with LOOKUPSWITCHLike {
 
     override final def asLOOKUPSWITCH: this.type = this
@@ -157,8 +157,8 @@ object LOOKUPSWITCH extends InstructionMetaInformation {
  * @author Malte Limmeroth
  */
 case class LabeledLOOKUPSWITCH(
-        defaultBranchTarget: InstructionLabel,
-        npairs:              ArraySeq[(Int, InstructionLabel)]
+    defaultBranchTarget: InstructionLabel,
+    npairs:              ArraySeq[(Int, InstructionLabel)]
 ) extends LabeledInstruction with LOOKUPSWITCHLike {
 
     override def tableSize: Int = npairs.size
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/MULTIANEWARRAY.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/MULTIANEWARRAY.scala
index a35c0c1d3d..00a81cbee5 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/MULTIANEWARRAY.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/MULTIANEWARRAY.scala
@@ -12,8 +12,8 @@ package instructions
  * @author Michael Eichberg
  */
 case class MULTIANEWARRAY(
-        arrayType:  ArrayType,
-        dimensions: Int
+    arrayType:  ArrayType,
+    dimensions: Int
 ) extends CreateNewArrayInstruction
     with InstructionMetaInformation {
 
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/PUTFIELD.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/PUTFIELD.scala
index f72fba6263..edbde32969 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/PUTFIELD.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/PUTFIELD.scala
@@ -12,9 +12,9 @@ package instructions
  * @author Michael Eichberg
  */
 case class PUTFIELD(
-        declaringClass: ObjectType,
-        name:           String,
-        fieldType:      FieldType
+    declaringClass: ObjectType,
+    name:           String,
+    fieldType:      FieldType
 ) extends FieldWriteAccess {
 
     final def opcode: Opcode = PUTFIELD.opcode
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/PUTSTATIC.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/PUTSTATIC.scala
index 4b5bebdeec..d17cd2477b 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/PUTSTATIC.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/PUTSTATIC.scala
@@ -12,9 +12,9 @@ package instructions
  * @author Michael Eichberg
  */
 case class PUTSTATIC(
-        declaringClass: ObjectType,
-        name:           String,
-        fieldType:      FieldType
+    declaringClass: ObjectType,
+    name:           String,
+    fieldType:      FieldType
 ) extends FieldWriteAccess {
 
     final def opcode: Opcode = PUTSTATIC.opcode
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/RET.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/RET.scala
index c75cc9c9ae..f0578e237e 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/RET.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/RET.scala
@@ -15,7 +15,7 @@ import org.opalj.br.cfg.CFGFactory
  * @author Michael Eichberg
  */
 case class RET(
-        lvIndex: Int
+    lvIndex: Int
 ) extends ControlTransferInstruction
     with ConstantLengthInstruction
     with NoLabels {
diff --git a/OPAL/br/src/main/scala/org/opalj/br/instructions/TABLESWITCH.scala b/OPAL/br/src/main/scala/org/opalj/br/instructions/TABLESWITCH.scala
index 1ebefd94bf..a6d8923ef7 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/instructions/TABLESWITCH.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/instructions/TABLESWITCH.scala
@@ -33,10 +33,10 @@ trait TABLESWITCHLike extends CompoundConditionalBranchInstructionLike {
 }
 
 case class TABLESWITCH(
-        defaultOffset: Int,
-        low:           Int,
-        high:          Int,
-        jumpOffsets:   ArraySeq[Int]
+    defaultOffset: Int,
+    low:           Int,
+    high:          Int,
+    jumpOffsets:   ArraySeq[Int]
 ) extends CompoundConditionalBranchInstruction with TABLESWITCHLike {
 
     override final def asTABLESWITCH: this.type = this
@@ -165,10 +165,10 @@ object TABLESWITCH extends InstructionMetaInformation {
  * @author Malte Limmeroth
  */
 case class LabeledTABLESWITCH(
-        defaultBranchTarget: InstructionLabel,
-        low:                 Int,
-        high:                Int,
-        jumpTargets:         ArraySeq[InstructionLabel]
+    defaultBranchTarget: InstructionLabel,
+    low:                 Int,
+    high:                Int,
+    jumpTargets:         ArraySeq[InstructionLabel]
 ) extends LabeledInstruction with TABLESWITCHLike {
 
     @throws[BranchoffsetOutOfBoundsException]("if the branchoffset is invalid")
diff --git a/OPAL/br/src/main/scala/org/opalj/br/reader/Java11FrameworkWithCaching.scala b/OPAL/br/src/main/scala/org/opalj/br/reader/Java11FrameworkWithCaching.scala
index 55949e0be2..d59b4a4b81 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/reader/Java11FrameworkWithCaching.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/reader/Java11FrameworkWithCaching.scala
@@ -11,5 +11,5 @@ package reader
  * @author Dominik Helm
  */
 class Java11FrameworkWithCaching(
-        cache: BytecodeInstructionsCache
+    cache: BytecodeInstructionsCache
 ) extends Java9FrameworkWithCaching(cache) with Java11LibraryFramework
diff --git a/OPAL/br/src/main/scala/org/opalj/br/reader/Java11FrameworkWithDynamicRewritingAndCaching.scala b/OPAL/br/src/main/scala/org/opalj/br/reader/Java11FrameworkWithDynamicRewritingAndCaching.scala
index 4d7a0cb984..a02806d3aa 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/reader/Java11FrameworkWithDynamicRewritingAndCaching.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/reader/Java11FrameworkWithDynamicRewritingAndCaching.scala
@@ -13,7 +13,7 @@ package reader
  * @author Dominik Helm
  */
 class Java11FrameworkWithDynamicRewritingAndCaching(
-        cache: BytecodeInstructionsCache
+    cache: BytecodeInstructionsCache
 ) extends Java9FrameworkWithInvokedynamicSupportAndCaching(cache)
     with Java11LibraryFramework
     with DynamicConstantRewriting
diff --git a/OPAL/br/src/main/scala/org/opalj/br/reader/Java16FrameworkWithCaching.scala b/OPAL/br/src/main/scala/org/opalj/br/reader/Java16FrameworkWithCaching.scala
index ad5a738ceb..ec26f5baf5 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/reader/Java16FrameworkWithCaching.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/reader/Java16FrameworkWithCaching.scala
@@ -11,5 +11,5 @@ package reader
  * @author Dominik Helm
  */
 class Java16FrameworkWithCaching(
-        cache: BytecodeInstructionsCache
+    cache: BytecodeInstructionsCache
 ) extends Java11FrameworkWithCaching(cache) with Java16LibraryFramework
diff --git a/OPAL/br/src/main/scala/org/opalj/br/reader/Java16FrameworkWithDynamicRewritingAndCaching.scala b/OPAL/br/src/main/scala/org/opalj/br/reader/Java16FrameworkWithDynamicRewritingAndCaching.scala
index 5c0ae5daf9..f9ddd93d91 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/reader/Java16FrameworkWithDynamicRewritingAndCaching.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/reader/Java16FrameworkWithDynamicRewritingAndCaching.scala
@@ -13,5 +13,5 @@ package reader
  * @author Dominik Helm
  */
 class Java16FrameworkWithDynamicRewritingAndCaching(
-        cache: BytecodeInstructionsCache
+    cache: BytecodeInstructionsCache
 ) extends Java11FrameworkWithDynamicRewritingAndCaching(cache) with Java16LibraryFramework
diff --git a/OPAL/br/src/main/scala/org/opalj/br/reader/Java17FrameworkWithCaching.scala b/OPAL/br/src/main/scala/org/opalj/br/reader/Java17FrameworkWithCaching.scala
index 84eb58308c..49c36f6d90 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/reader/Java17FrameworkWithCaching.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/reader/Java17FrameworkWithCaching.scala
@@ -11,5 +11,5 @@ package reader
  * @author Julius Naeumann
  */
 class Java17FrameworkWithCaching(
-        cache: BytecodeInstructionsCache
+    cache: BytecodeInstructionsCache
 ) extends Java16FrameworkWithCaching(cache) with Java17LibraryFramework
diff --git a/OPAL/br/src/main/scala/org/opalj/br/reader/Java17FrameworkWithDynamicRewritingAndCaching.scala b/OPAL/br/src/main/scala/org/opalj/br/reader/Java17FrameworkWithDynamicRewritingAndCaching.scala
index ad0dbd294a..465a792373 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/reader/Java17FrameworkWithDynamicRewritingAndCaching.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/reader/Java17FrameworkWithDynamicRewritingAndCaching.scala
@@ -13,5 +13,5 @@ package reader
  * @author Julius Naeumann
  */
 class Java17FrameworkWithDynamicRewritingAndCaching(
-        cache: BytecodeInstructionsCache
+    cache: BytecodeInstructionsCache
 ) extends Java16FrameworkWithDynamicRewritingAndCaching(cache) with Java17LibraryFramework
diff --git a/OPAL/br/src/main/scala/org/opalj/br/reader/Java8FrameworkWithCaching.scala b/OPAL/br/src/main/scala/org/opalj/br/reader/Java8FrameworkWithCaching.scala
index 00ee394bf6..a55f86cdb0 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/reader/Java8FrameworkWithCaching.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/reader/Java8FrameworkWithCaching.scala
@@ -13,7 +13,7 @@ import org.opalj.bi.reader.CodeReader
  * @author Michael Eichberg
  */
 class Java8FrameworkWithCaching(
-        val cache: BytecodeInstructionsCache
+    val cache: BytecodeInstructionsCache
 ) extends Java8LibraryFramework
     with CodeAttributeBinding
     with SourceDebugExtension_attributeBinding
diff --git a/OPAL/br/src/main/scala/org/opalj/br/reader/Java8FrameworkWithInvokedynamicSupportAndCaching.scala b/OPAL/br/src/main/scala/org/opalj/br/reader/Java8FrameworkWithInvokedynamicSupportAndCaching.scala
index 0be0af50c1..6debb265e2 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/reader/Java8FrameworkWithInvokedynamicSupportAndCaching.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/reader/Java8FrameworkWithInvokedynamicSupportAndCaching.scala
@@ -13,6 +13,6 @@ package reader
  * @author Michael Eichberg
  */
 class Java8FrameworkWithInvokedynamicSupportAndCaching(
-        cache: BytecodeInstructionsCache
+    cache: BytecodeInstructionsCache
 ) extends Java8FrameworkWithCaching(cache)
     with InvokedynamicRewriting
diff --git a/OPAL/br/src/main/scala/org/opalj/br/reader/Java9FrameworkWithCaching.scala b/OPAL/br/src/main/scala/org/opalj/br/reader/Java9FrameworkWithCaching.scala
index c4be515d73..a8751f96e4 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/reader/Java9FrameworkWithCaching.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/reader/Java9FrameworkWithCaching.scala
@@ -11,6 +11,6 @@ package reader
  * @author Michael Eichberg
  */
 class Java9FrameworkWithCaching(
-        cache: BytecodeInstructionsCache
+    cache: BytecodeInstructionsCache
 ) extends Java8FrameworkWithCaching(cache)
     with Java9LibraryFramework
diff --git a/OPAL/br/src/main/scala/org/opalj/br/reader/Java9FrameworkWithInvokedynamicSupportAndCaching.scala b/OPAL/br/src/main/scala/org/opalj/br/reader/Java9FrameworkWithInvokedynamicSupportAndCaching.scala
index 8644c28980..0607993131 100644
--- a/OPAL/br/src/main/scala/org/opalj/br/reader/Java9FrameworkWithInvokedynamicSupportAndCaching.scala
+++ b/OPAL/br/src/main/scala/org/opalj/br/reader/Java9FrameworkWithInvokedynamicSupportAndCaching.scala
@@ -12,5 +12,5 @@ package reader
  * @author Michael Eichberg
  */
 class Java9FrameworkWithInvokedynamicSupportAndCaching(
-        cache: BytecodeInstructionsCache
+    cache: BytecodeInstructionsCache
 ) extends Java8FrameworkWithInvokedynamicSupportAndCaching(cache) with Java9LibraryFramework
diff --git a/OPAL/br/src/main/scala/org/opalj/value/ValueInformation.scala b/OPAL/br/src/main/scala/org/opalj/value/ValueInformation.scala
index 58546adb9e..c0ff91e8f6 100644
--- a/OPAL/br/src/main/scala/org/opalj/value/ValueInformation.scala
+++ b/OPAL/br/src/main/scala/org/opalj/value/ValueInformation.scala
@@ -714,10 +714,10 @@ trait IsMObjectValue extends IsBaseReferenceValue {
  * Represents an object value which is either null or properly initialized.
  */
 case class AProperMObjectValue(
-        override val isNull:    Answer,
-        override val isPrecise: Boolean,
-        upperTypeBound:         UIDSet[ObjectType],
-        leastUpperType:         Option[ReferenceType] // actually always Some[ObjectType]
+    override val isNull:    Answer,
+    override val isPrecise: Boolean,
+    upperTypeBound:         UIDSet[ObjectType],
+    leastUpperType:         Option[ReferenceType] // actually always Some[ObjectType]
 ) extends IsMObjectValue {
     override def toCanonicalForm: IsMObjectValue = this
     override def toString: String = {
@@ -796,9 +796,9 @@ trait IsSObjectValue extends IsSReferenceValue[ObjectType] {
  * Represents some object value which may be null and may even not be properly initialized yet.
  */
 case class ASObjectValue(
-        isNull:                 Answer,
-        override val isPrecise: Boolean,
-        theUpperTypeBound:      ObjectType
+    isNull:                 Answer,
+    override val isPrecise: Boolean,
+    theUpperTypeBound:      ObjectType
 ) extends IsSObjectValue {
     override def toCanonicalForm: IsSObjectValue = this
     override def toString: String = {
@@ -811,9 +811,9 @@ case class ASObjectValue(
  * Represents an object value which is either null or properly initialized.
  */
 case class AProperSObjectValue(
-        isNull:                 Answer,
-        override val isPrecise: Boolean,
-        theUpperTypeBound:      ObjectType
+    isNull:                 Answer,
+    override val isPrecise: Boolean,
+    theUpperTypeBound:      ObjectType
 ) extends IsSObjectValue {
     override def toCanonicalForm: IsSObjectValue = this
     override def toString: String = {
@@ -857,9 +857,9 @@ trait IsSArrayValue extends IsSReferenceValue[ArrayType] {
 }
 
 case class ASArrayValue(
-        override val isNull:    Answer,
-        override val isPrecise: Boolean,
-        theUpperTypeBound:      ArrayType
+    override val isNull:    Answer,
+    override val isPrecise: Boolean,
+    theUpperTypeBound:      ArrayType
 ) extends IsSArrayValue {
     override def toCanonicalForm: IsSArrayValue = this
     override def toString: String = {
@@ -870,8 +870,8 @@ case class ASArrayValue(
 }
 
 case class ASArrayWithLengthValue(
-        length:            Int,
-        theUpperTypeBound: ArrayType
+    length:            Int,
+    theUpperTypeBound: ArrayType
 ) extends IsSArrayValue {
     override def isNull: Answer = No
     override def isPrecise: Boolean = true
@@ -1054,11 +1054,11 @@ trait IsMultipleReferenceValue extends IsReferenceValue {
 }
 
 case class AMultipleReferenceValue(
-        baseValues:     Iterable[IsReferenceValue],
-        isNull:         Answer,
-        isPrecise:      Boolean,
-        upperTypeBound: UIDSet[_ <: ReferenceType],
-        leastUpperType: Option[ReferenceType] // None in case of "null"
+    baseValues:     Iterable[IsReferenceValue],
+    isNull:         Answer,
+    isPrecise:      Boolean,
+    upperTypeBound: UIDSet[_ <: ReferenceType],
+    leastUpperType: Option[ReferenceType] // None in case of "null"
 ) extends IsMultipleReferenceValue {
 
     assert((isNull.isYes && leastUpperType.isEmpty) || (isNull.isNoOrUnknown && leastUpperType.isDefined))
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/immutable/IdentityPair.scala b/OPAL/common/src/main/scala/org/opalj/collection/immutable/IdentityPair.scala
index 16b4800e38..54dfd6f01e 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/immutable/IdentityPair.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/immutable/IdentityPair.scala
@@ -25,8 +25,8 @@ package immutable
  * @author Michael Eichberg
  */
 final case class IdentityPair[+T1 <: AnyRef, +T2 <: AnyRef](
-        _1: T1,
-        _2: T2
+    _1: T1,
+    _2: T2
 ) extends Product2[T1, T2] {
 
     override def canEqual(other: Any): Boolean = other.isInstanceOf[IdentityPair[_, _]]
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/immutable/Int2List.scala b/OPAL/common/src/main/scala/org/opalj/collection/immutable/Int2List.scala
index ff5bb394fb..7e1c7a52bd 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/immutable/Int2List.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/immutable/Int2List.scala
@@ -99,9 +99,9 @@ case object Int2ListEnd extends Int2List {
  * @author Michael Eichberg
  */
 final case class Int2ListNode(
-        private[immutable] var h:    Int,
-        private[immutable] var t:    Int,
-        private[immutable] var rest: Int2List = Int2ListEnd
+    private[immutable] var h:    Int,
+    private[immutable] var t:    Int,
+    private[immutable] var rest: Int2List = Int2ListEnd
 ) extends Int2List { list =>
 
     override def isEmpty: Boolean = false
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/immutable/IntArraySet.scala b/OPAL/common/src/main/scala/org/opalj/collection/immutable/IntArraySet.scala
index 0a73023602..b2ee733a72 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/immutable/IntArraySet.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/immutable/IntArraySet.scala
@@ -335,7 +335,7 @@ private[immutable] case class IntArraySet3(i1: Int, i2: Int, i3: Int) extends In
 }
 
 case class IntArraySetN private[immutable] (
-        private[immutable] val is: Array[Int]
+    private[immutable] val is: Array[Int]
 ) extends IntArraySet {
 
     assert(is.length > 3)
@@ -509,8 +509,8 @@ case class IntArraySetN private[immutable] (
 
 // TODO Reduce to "FilterMonadic" methods.
 private[immutable] class FilteredIntArraySet(
-        p:     Int => Boolean,
-        origS: IntArraySetN
+    p:     Int => Boolean,
+    origS: IntArraySetN
 ) extends IntArraySet {
 
     @volatile private[this] var filteredS: IntArraySet = _
@@ -616,8 +616,8 @@ private[immutable] class FilteredIntArraySet(
 }
 
 class IntArraySetBuilder private[immutable] (
-        private[this] var is:   Array[Int],
-        private[this] var size: Int
+    private[this] var is:   Array[Int],
+    private[this] var size: Int
 ) extends Builder[Int, IntArraySet] {
 
     require(size <= is.length)
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/immutable/IntList.scala b/OPAL/common/src/main/scala/org/opalj/collection/immutable/IntList.scala
index 8344fd1a17..605d5f1765 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/immutable/IntList.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/immutable/IntList.scala
@@ -92,8 +92,8 @@ case object EmptyIntList extends IntList {
  * @author Michael Eichberg
  */
 final case class IntListNode(
-        head:                        Int,
-        private[immutable] var rest: IntList = EmptyIntList
+    head:                        Int,
+    private[immutable] var rest: IntList = EmptyIntList
 ) extends IntList { list =>
 
     override def tail: IntList = rest
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/immutable/IntTrieSet.scala b/OPAL/common/src/main/scala/org/opalj/collection/immutable/IntTrieSet.scala
index c11ccd5e0d..ef28ea40d2 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/immutable/IntTrieSet.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/immutable/IntTrieSet.scala
@@ -106,8 +106,8 @@ sealed abstract class IntTrieSet
 
 // TODO Reduce to FilterMonadic
 final class FilteredIntTrieSet(
-        private val s: IntTrieSet,
-        private val p: Int => Boolean
+    private val s: IntTrieSet,
+    private val p: Int => Boolean
 ) extends IntTrieSet {
 
     override def iterator: IntIterator = s.iterator.withFilter(p)
@@ -355,8 +355,8 @@ object IntTrieSet1 {
  * Represents an ordered set of two values where i1 has to be smaller than i2.
  */
 private[immutable] final class IntTrieSet2 private[immutable] (
-        val i1: Int,
-        val i2: Int
+    val i1: Int,
+    val i2: Int
 ) extends IntTrieSetL {
 
     override def isEmpty: Boolean = false
@@ -482,9 +482,9 @@ private[immutable] final class IntTrieSet2 private[immutable] (
  * Represents an ordered set of three int values: i1 < i2 < i3.
  */
 private[immutable] final class IntTrieSet3 private[immutable] (
-        val i1: Int,
-        val i2: Int,
-        val i3: Int
+    val i1: Int,
+    val i2: Int,
+    val i3: Int
 ) extends IntTrieSetL {
 
     override def isEmpty: Boolean = false
@@ -654,9 +654,9 @@ abstract private[immutable] class IntTrieSetNN extends IntTrieSet {
 }
 
 private[immutable] final class IntTrieSetN private[immutable] (
-        private[immutable] var left:  IntTrieSet, // can be empty, but never null!
-        private[immutable] var right: IntTrieSet, // can be empty, but never null!
-        var size:                     Int
+    private[immutable] var left:  IntTrieSet, // can be empty, but never null!
+    private[immutable] var right: IntTrieSet, // can be empty, but never null!
+    var size:                     Int
 ) extends IntTrieSetNN { intSet =>
 
     assert(left.size + right.size == size)
@@ -914,7 +914,7 @@ private[immutable] object IntTrieSetN {
 }
 
 private[immutable] final class IntTrieSetNJustRight private[immutable] (
-        private[immutable] var right: IntTrieSet // can't be empty, left is already empty
+    private[immutable] var right: IntTrieSet // can't be empty, left is already empty
 ) extends IntTrieSetNN { intSet =>
 
     assert(size > 0) // <= can be "one" at construction time
@@ -1044,7 +1044,7 @@ private[immutable] final class IntTrieSetNJustRight private[immutable] (
 }
 
 private[immutable] final class IntTrieSetNJustLeft private[immutable] (
-        private[immutable] var left: IntTrieSet // cannot be empty; right is empty
+    private[immutable] var left: IntTrieSet // cannot be empty; right is empty
 ) extends IntTrieSetNN { intSet =>
 
     assert(size > 0) // <= can be "one" at construction time
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/immutable/Long2List.scala b/OPAL/common/src/main/scala/org/opalj/collection/immutable/Long2List.scala
index 2e727c985c..6889f10ce4 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/immutable/Long2List.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/immutable/Long2List.scala
@@ -197,8 +197,8 @@ abstract private[immutable] class Long2List1_4 extends Long2List {
 }
 
 private[immutable] final class Long2List1(
-        private[immutable] val v1:   Long,
-        private[immutable] val rest: Long2List4
+    private[immutable] val v1:   Long,
+    private[immutable] val rest: Long2List4
 ) extends Long2List1_4 { list =>
 
     override def isSingletonList: Boolean = rest == null
@@ -248,9 +248,9 @@ private[immutable] final class Long2List1(
 }
 
 private[immutable] final class Long2List2(
-        private[immutable] var v1:   Long,
-        private[immutable] var v2:   Long,
-        private[immutable] var rest: Long2List4
+    private[immutable] var v1:   Long,
+    private[immutable] var v2:   Long,
+    private[immutable] var rest: Long2List4
 ) extends Long2List1_4 { list =>
 
     override def isSingletonList: Boolean = false
@@ -297,10 +297,10 @@ private[immutable] final class Long2List2(
 }
 
 private[immutable] final class Long2List3(
-        private[immutable] var v1:   Long,
-        private[immutable] var v2:   Long,
-        private[immutable] var v3:   Long,
-        private[immutable] var rest: Long2List4
+    private[immutable] var v1:   Long,
+    private[immutable] var v2:   Long,
+    private[immutable] var v3:   Long,
+    private[immutable] var rest: Long2List4
 ) extends Long2List1_4 { list =>
 
     override def isSingletonList: Boolean = false
@@ -355,11 +355,11 @@ private[immutable] final class Long2List3(
 }
 
 private[immutable] final class Long2List4(
-        private[immutable] var v1:   Long,
-        private[immutable] var v2:   Long,
-        private[immutable] var v3:   Long,
-        private[immutable] var v4:   Long,
-        private[immutable] var rest: Long2List4
+    private[immutable] var v1:   Long,
+    private[immutable] var v2:   Long,
+    private[immutable] var v3:   Long,
+    private[immutable] var v4:   Long,
+    private[immutable] var rest: Long2List4
 ) extends Long2List1_4 { list =>
 
     override def isSingletonList: Boolean = false
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongLinkedTrieSet.scala b/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongLinkedTrieSet.scala
index 0f8c100102..74849f6528 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongLinkedTrieSet.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongLinkedTrieSet.scala
@@ -77,8 +77,8 @@ final case class LongLinkedTrieSet1(v1: Long) extends LongLinkedTrieSet {
 }
 
 private[immutable] final case class LongLinkedTrieSet2(
-        v1: Long,
-        v2: Long
+    v1: Long,
+    v2: Long
 ) extends LongLinkedTrieSet {
 
     override final def size: Int = 2
@@ -105,9 +105,9 @@ private[immutable] final case class LongLinkedTrieSet2(
 }
 
 private[immutable] final case class LongLinkedTrieSet3(
-        v1: Long,
-        v2: Long,
-        v3: Long
+    v1: Long,
+    v2: Long,
+    v3: Long
 ) extends LongLinkedTrieSet {
 
     override final def size: Int = 3
@@ -178,8 +178,8 @@ sealed abstract private[immutable] class LongLinkedTrieSetNode {
 
 /** The leaves of the trie set. */
 private[immutable] final class LongLinkedTrieSetL(
-        final val value: Long,
-        final val next:  LongLinkedTrieSetL = null // `null` if this leaf is the first element that was added to the set.
+    final val value: Long,
+    final val next:  LongLinkedTrieSetL = null // `null` if this leaf is the first element that was added to the set.
 ) extends LongLinkedTrieSetNode {
 
     override def isN: Boolean = false
@@ -364,7 +364,7 @@ private[immutable] object LongLinkedTrieSetNShared {
 }
 
 private[immutable] final class LongLinkedTrieSetNShared_0(
-        final val n: LongLinkedTrieSetNode
+    final val n: LongLinkedTrieSetNode
 ) extends LongLinkedTrieSetNShared {
 
     override def sharedBits: Long = 0
@@ -402,7 +402,7 @@ private[immutable] final class LongLinkedTrieSetNShared_0(
 }
 
 private[immutable] final class LongLinkedTrieSetNShared_1(
-        final val n: LongLinkedTrieSetNode
+    final val n: LongLinkedTrieSetNode
 ) extends LongLinkedTrieSetNShared {
 
     override def sharedBits: Long = 1
@@ -440,7 +440,7 @@ private[immutable] final class LongLinkedTrieSetNShared_1(
 }
 
 private[immutable] final class LongLinkedTrieSetNShared_00(
-        final val n: LongLinkedTrieSetNode
+    final val n: LongLinkedTrieSetNode
 ) extends LongLinkedTrieSetNShared {
     override def sharedBits: Long = 0
     override def length: Int = 2
@@ -456,7 +456,7 @@ private[immutable] final class LongLinkedTrieSetNShared_00(
 }
 
 private[immutable] final class LongLinkedTrieSetNShared_01(
-        final val n: LongLinkedTrieSetNode
+    final val n: LongLinkedTrieSetNode
 ) extends LongLinkedTrieSetNShared {
     def sharedBits: Long = 1
     def length: Int = 2
@@ -471,7 +471,7 @@ private[immutable] final class LongLinkedTrieSetNShared_01(
 }
 
 private[immutable] final class LongLinkedTrieSetNShared_10(
-        final val n: LongLinkedTrieSetNode
+    final val n: LongLinkedTrieSetNode
 ) extends LongLinkedTrieSetNShared {
     def sharedBits: Long = 2
     def length: Int = 2
@@ -486,7 +486,7 @@ private[immutable] final class LongLinkedTrieSetNShared_10(
 }
 
 private[immutable] final class LongLinkedTrieSetNShared_11(
-        final val n: LongLinkedTrieSetNode
+    final val n: LongLinkedTrieSetNode
 ) extends LongLinkedTrieSetNShared {
     def sharedBits: Long = 3
     def length: Int = 2
@@ -501,9 +501,9 @@ private[immutable] final class LongLinkedTrieSetNShared_11(
 }
 
 private[immutable] final class LongLinkedTrieSetNShared_X(
-        val sharedBits: Long,
-        val length:     Int,
-        val n:          LongLinkedTrieSetNode
+    val sharedBits: Long,
+    val length:     Int,
+    val n:          LongLinkedTrieSetNode
 ) extends LongLinkedTrieSetNShared {
 
     override def split_0(level: Int): LongLinkedTrieSetNode = {
@@ -539,8 +539,8 @@ private[immutable] final class LongLinkedTrieSetNShared_X(
 
 /** The inner nodes of the trie set. */
 private[immutable] final class LongLinkedTrieSetN2(
-        final val _0: LongLinkedTrieSetNode,
-        final val _1: LongLinkedTrieSetNode
+    final val _0: LongLinkedTrieSetNode,
+    final val _1: LongLinkedTrieSetNode
 ) extends LongLinkedTrieSetInnerNode {
 
     override def isN4: Boolean = false
@@ -833,8 +833,8 @@ abstract private[immutable] class LongLinkedTrieSetN4 extends LongLinkedTrieSetI
 }
 
 private[immutable] final class LongLinkedTrieSetN4_0_1(
-        final val _0: LongLinkedTrieSetNode,
-        final val _1: LongLinkedTrieSetNode
+    final val _0: LongLinkedTrieSetNode,
+    final val _1: LongLinkedTrieSetNode
 ) extends LongLinkedTrieSetN4 {
     override protected final def _2: LongLinkedTrieSetNode = null
     override protected final def _3: LongLinkedTrieSetNode = null
@@ -874,8 +874,8 @@ private[immutable] final class LongLinkedTrieSetN4_0_1(
 }
 
 private[immutable] final class LongLinkedTrieSetN4_0_2(
-        final val _0: LongLinkedTrieSetNode,
-        final val _2: LongLinkedTrieSetNode
+    final val _0: LongLinkedTrieSetNode,
+    final val _2: LongLinkedTrieSetNode
 ) extends LongLinkedTrieSetN4 {
     override protected final def _1: LongLinkedTrieSetNode = null
     override protected final def _3: LongLinkedTrieSetNode = null
@@ -916,8 +916,8 @@ private[immutable] final class LongLinkedTrieSetN4_0_2(
 }
 
 private[immutable] final class LongLinkedTrieSetN4_0_3(
-        final val _0: LongLinkedTrieSetNode,
-        final val _3: LongLinkedTrieSetNode
+    final val _0: LongLinkedTrieSetNode,
+    final val _3: LongLinkedTrieSetNode
 ) extends LongLinkedTrieSetN4 {
 
     override protected final def _1: LongLinkedTrieSetNode = null
@@ -959,8 +959,8 @@ private[immutable] final class LongLinkedTrieSetN4_0_3(
 }
 
 private[immutable] final class LongLinkedTrieSetN4_1_2(
-        final val _1: LongLinkedTrieSetNode,
-        final val _2: LongLinkedTrieSetNode
+    final val _1: LongLinkedTrieSetNode,
+    final val _2: LongLinkedTrieSetNode
 ) extends LongLinkedTrieSetN4 {
     override protected final def _0: LongLinkedTrieSetNode = null
     override protected final def _3: LongLinkedTrieSetNode = null
@@ -1002,8 +1002,8 @@ private[immutable] final class LongLinkedTrieSetN4_1_2(
 }
 
 private[immutable] final class LongLinkedTrieSetN4_1_3(
-        final val _1: LongLinkedTrieSetNode,
-        final val _3: LongLinkedTrieSetNode
+    final val _1: LongLinkedTrieSetNode,
+    final val _3: LongLinkedTrieSetNode
 ) extends LongLinkedTrieSetN4 {
     override protected final def _0: LongLinkedTrieSetNode = null
     override protected final def _2: LongLinkedTrieSetNode = null
@@ -1044,8 +1044,8 @@ private[immutable] final class LongLinkedTrieSetN4_1_3(
 }
 
 private[immutable] final class LongLinkedTrieSetN4_2_3(
-        final val _2: LongLinkedTrieSetNode,
-        final val _3: LongLinkedTrieSetNode
+    final val _2: LongLinkedTrieSetNode,
+    final val _3: LongLinkedTrieSetNode
 ) extends LongLinkedTrieSetN4 {
     override protected final def _0: LongLinkedTrieSetNode = null
     override protected final def _1: LongLinkedTrieSetNode = null
@@ -1087,11 +1087,11 @@ private[immutable] final class LongLinkedTrieSetN4_2_3(
 }
 
 private[immutable] final class LongLinkedTrieSetN4_0_1_2_3(
-        // least significant bits _ (current) second most important bit _ (current) most important bit
-        final val _0: LongLinkedTrieSetNode, // a tree node, a leaf node or null
-        final val _1: LongLinkedTrieSetNode, // a tree node, a leaf node or null
-        final val _2: LongLinkedTrieSetNode, // a tree node, a leaf node or null
-        final val _3: LongLinkedTrieSetNode // a tree node, a leaf node or null
+    // least significant bits _ (current) second most important bit _ (current) most important bit
+    final val _0: LongLinkedTrieSetNode, // a tree node, a leaf node or null
+    final val _1: LongLinkedTrieSetNode, // a tree node, a leaf node or null
+    final val _2: LongLinkedTrieSetNode, // a tree node, a leaf node or null
+    final val _3: LongLinkedTrieSetNode // a tree node, a leaf node or null
 ) extends LongLinkedTrieSetN4 {
 
     override def contains(v: Long, key: Long): Boolean = {
@@ -1169,10 +1169,10 @@ object LargeLongLinkedTrieSet {
 }
 
 private[immutable] class LargeLongLinkedTrieSet(
-        var size: Int = 0,
-        // the length of the array must be a power of 2!
-        val tries: Array[LongLinkedTrieSetNode] = new Array(LargeLongLinkedTrieSet.InitialBucketsCount),
-        var l:     LongLinkedTrieSetL           = null // points to the latest element that was added...
+    var size: Int = 0,
+    // the length of the array must be a power of 2!
+    val tries: Array[LongLinkedTrieSetNode] = new Array(LargeLongLinkedTrieSet.InitialBucketsCount),
+    var l:     LongLinkedTrieSetL           = null // points to the latest element that was added...
 ) extends LongLinkedTrieSet { set =>
 
     override final def +(v: Long): LargeLongLinkedTrieSet = {
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongList.scala b/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongList.scala
index 669600cdcf..d771ca3d9f 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongList.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongList.scala
@@ -86,8 +86,8 @@ case object LongList0 extends LongList {
  * @author Michael Eichberg
  */
 final case class LongListNode(
-        head:                        Long,
-        private[immutable] var rest: LongList = LongList0
+    head:                        Long,
+    private[immutable] var rest: LongList = LongList0
 ) extends LongList { list =>
 
     override def tail: LongList = rest
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongTrieSet.scala b/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongTrieSet.scala
index a492fd3f02..d0421a1e0c 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongTrieSet.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongTrieSet.scala
@@ -170,8 +170,8 @@ private[immutable] final class LongTrieSet1(val i1: Long) extends LongTrieSetLea
  * Represents an ordered set of two values where i1 has to be smaller than i2.
  */
 private[immutable] final class LongTrieSet2(
-        val i1: Long,
-        val i2: Long
+    val i1: Long,
+    val i2: Long
 ) extends LongTrieSetLeaf {
 
     override def isEmpty: Boolean = false
@@ -223,9 +223,9 @@ private[immutable] final class LongTrieSet2(
  * Represents an ordered set of three int values: i1 < i2 < i3.
  */
 private[immutable] final class LongTrieSet3(
-        val i1: Long,
-        val i2: Long,
-        val i3: Long
+    val i1: Long,
+    val i2: Long,
+    val i3: Long
 ) extends LongTrieSetLeaf {
 
     override def size: Int = 3
@@ -446,8 +446,8 @@ private[immutable] final class LongTrieSet3(
 }
 
 private[immutable] final class LongTrieSetN(
-        final val size: Int,
-        final val root: LongTrieSetNode
+    final val size: Int,
+    final val root: LongTrieSetNode
 ) extends LongTrieSet {
 
     // assert(size >= 4)
@@ -579,8 +579,8 @@ private[immutable] final class LongTrieSetN(
 }
 
 private[immutable] final class LongTrieSetNode1(
-        final val n1Bits: Int,
-        final val n1:     LongTrieSetNode
+    final val n1Bits: Int,
+    final val n1:     LongTrieSetNode
 ) extends LongTrieSetNode {
 
     override def foreach[U](f:  Long => U): Unit = n1.foreach(f)
@@ -698,9 +698,9 @@ sealed abstract private[immutable] class LongTrieSetNode2_7 extends LongTrieSetN
 }
 
 private[immutable] final class LongTrieSetNode2(
-        final val lookupTable: Int,
-        final val n1:          LongTrieSetNode,
-        final val n2:          LongTrieSetNode
+    final val lookupTable: Int,
+    final val n1:          LongTrieSetNode,
+    final val n2:          LongTrieSetNode
 ) extends LongTrieSetNode2_7 {
 
     override def node(index: Int): LongTrieSetNode = {
@@ -754,10 +754,10 @@ private[immutable] final class LongTrieSetNode2(
 }
 
 private[immutable] final class LongTrieSetNode3(
-        final val lookupTable: Int,
-        final val n1:          LongTrieSetNode,
-        final val n2:          LongTrieSetNode,
-        final val n3:          LongTrieSetNode
+    final val lookupTable: Int,
+    final val n1:          LongTrieSetNode,
+    final val n2:          LongTrieSetNode,
+    final val n3:          LongTrieSetNode
 ) extends LongTrieSetNode2_7 {
 
     override def foreach[U](f: Long => U): Unit = {
@@ -819,11 +819,11 @@ private[immutable] final class LongTrieSetNode3(
 }
 
 private[immutable] final class LongTrieSetNode4(
-        final val lookupTable: Int,
-        final val n1:          LongTrieSetNode,
-        final val n2:          LongTrieSetNode,
-        final val n3:          LongTrieSetNode,
-        final val n4:          LongTrieSetNode
+    final val lookupTable: Int,
+    final val n1:          LongTrieSetNode,
+    final val n2:          LongTrieSetNode,
+    final val n3:          LongTrieSetNode,
+    final val n4:          LongTrieSetNode
 ) extends LongTrieSetNode2_7 {
 
     override def foreach[U](f: Long => U): Unit = {
@@ -896,12 +896,12 @@ private[immutable] final class LongTrieSetNode4(
 }
 
 private[immutable] final class LongTrieSetNode5(
-        final val lookupTable: Int,
-        final val n1:          LongTrieSetNode,
-        final val n2:          LongTrieSetNode,
-        final val n3:          LongTrieSetNode,
-        final val n4:          LongTrieSetNode,
-        final val n5:          LongTrieSetNode
+    final val lookupTable: Int,
+    final val n1:          LongTrieSetNode,
+    final val n2:          LongTrieSetNode,
+    final val n3:          LongTrieSetNode,
+    final val n4:          LongTrieSetNode,
+    final val n5:          LongTrieSetNode
 ) extends LongTrieSetNode2_7 {
 
     override def foreach[U](f: Long => U): Unit = {
@@ -983,13 +983,13 @@ private[immutable] final class LongTrieSetNode5(
 }
 
 private[immutable] final class LongTrieSetNode6(
-        final val lookupTable: Int,
-        final val n1:          LongTrieSetNode,
-        final val n2:          LongTrieSetNode,
-        final val n3:          LongTrieSetNode,
-        final val n4:          LongTrieSetNode,
-        final val n5:          LongTrieSetNode,
-        final val n6:          LongTrieSetNode
+    final val lookupTable: Int,
+    final val n1:          LongTrieSetNode,
+    final val n2:          LongTrieSetNode,
+    final val n3:          LongTrieSetNode,
+    final val n4:          LongTrieSetNode,
+    final val n5:          LongTrieSetNode,
+    final val n6:          LongTrieSetNode
 ) extends LongTrieSetNode2_7 {
 
     override def foreach[U](f: Long => U): Unit = {
@@ -1086,14 +1086,14 @@ private[immutable] final class LongTrieSetNode6(
 }
 
 private[immutable] final class LongTrieSetNode7(
-        final val lookupTable: Int,
-        final val n1:          LongTrieSetNode,
-        final val n2:          LongTrieSetNode,
-        final val n3:          LongTrieSetNode,
-        final val n4:          LongTrieSetNode,
-        final val n5:          LongTrieSetNode,
-        final val n6:          LongTrieSetNode,
-        final val n7:          LongTrieSetNode
+    final val lookupTable: Int,
+    final val n1:          LongTrieSetNode,
+    final val n2:          LongTrieSetNode,
+    final val n3:          LongTrieSetNode,
+    final val n4:          LongTrieSetNode,
+    final val n5:          LongTrieSetNode,
+    final val n6:          LongTrieSetNode,
+    final val n7:          LongTrieSetNode
 ) extends LongTrieSetNode2_7 {
 
     override def foreach[U](f: Long => U): Unit = {
@@ -1210,14 +1210,14 @@ private[immutable] final class LongTrieSetNode7(
 }
 
 private[immutable] final class LongTrieSetNode8(
-        final val n1: LongTrieSetNode,
-        final val n2: LongTrieSetNode,
-        final val n3: LongTrieSetNode,
-        final val n4: LongTrieSetNode,
-        final val n5: LongTrieSetNode,
-        final val n6: LongTrieSetNode,
-        final val n7: LongTrieSetNode,
-        final val n8: LongTrieSetNode
+    final val n1: LongTrieSetNode,
+    final val n2: LongTrieSetNode,
+    final val n3: LongTrieSetNode,
+    final val n4: LongTrieSetNode,
+    final val n5: LongTrieSetNode,
+    final val n6: LongTrieSetNode,
+    final val n7: LongTrieSetNode,
+    final val n8: LongTrieSetNode
 ) extends LongTrieSetNode {
 
     override def foreach[U](f: Long => U): Unit = {
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongTrieSetWithList.scala b/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongTrieSetWithList.scala
index 96aceb9f10..f8d560f70b 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongTrieSetWithList.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/immutable/LongTrieSetWithList.scala
@@ -69,7 +69,7 @@ private[immutable] case object LongTrieSetWithList0 extends LongTrieSetWithList
 }
 
 private[immutable] final class LongTrieSetWithList1 private[immutable] (
-        private[immutable] final val i1: Long
+    private[immutable] final val i1: Long
 ) extends LongTrieSetWithList {
 
     override def isEmpty: Boolean = false
@@ -109,8 +109,8 @@ private[immutable] final class LongTrieSetWithList1 private[immutable] (
 }
 
 private[immutable] final class LongTrieSetWithList2 private[immutable] (
-        private[immutable] final val i1: Long,
-        private[immutable] final val i2: Long
+    private[immutable] final val i1: Long,
+    private[immutable] final val i2: Long
 ) extends LongTrieSetWithList {
 
     override def isEmpty: Boolean = false
@@ -155,9 +155,9 @@ private[immutable] final class LongTrieSetWithList2 private[immutable] (
 }
 
 private[immutable] final class LongTrieSetWithList3 private[immutable] (
-        private[immutable] final val i1: Long,
-        private[immutable] final val i2: Long,
-        private[immutable] final val i3: Long
+    private[immutable] final val i1: Long,
+    private[immutable] final val i2: Long,
+    private[immutable] final val i3: Long
 ) extends LongTrieSetWithList {
 
     override def size: Int = 3
@@ -210,9 +210,9 @@ private[immutable] final class LongTrieSetWithList3 private[immutable] (
 }
 
 private[immutable] final class LongTrieSetWithListN(
-        final val size: Int,
-        final val root: LongTrieSetNode,
-        final val list: Long2List
+    final val size: Int,
+    final val root: LongTrieSetNode,
+    final val list: Long2List
 ) extends LongTrieSetWithList {
 
     // assert(size >= 4)
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/immutable/Ref2List.scala b/OPAL/common/src/main/scala/org/opalj/collection/immutable/Ref2List.scala
index b9e98056ad..1fe8dfcd8a 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/immutable/Ref2List.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/immutable/Ref2List.scala
@@ -105,9 +105,9 @@ private[immutable] case object Ref2ListEnd extends Ref2List[Nothing] {
  * @author Michael Eichberg
  */
 private[immutable] final case class Ref2ListNode[T >: Null <: AnyRef](
-        private[immutable] var h:    T,
-        private[immutable] var t:    T,
-        private[immutable] var rest: Ref2List[T]
+    private[immutable] var h:    T,
+    private[immutable] var t:    T,
+    private[immutable] var rest: Ref2List[T]
 ) extends Ref2List[T] { list =>
 
     override def isEmpty: Boolean = false
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/immutable/UIDSet.scala b/OPAL/common/src/main/scala/org/opalj/collection/immutable/UIDSet.scala
index 4ad7550f3c..b62f809339 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/immutable/UIDSet.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/immutable/UIDSet.scala
@@ -954,7 +954,7 @@ private[immutable] object UIDSetNode {
 }
 
 final class UIDSetLeaf[T <: UID] private[immutable] (
-        val value: T
+    val value: T
 ) extends UIDSetNodeLike[T] {
     override def size: Int = 1
     override def left: UIDSetNodeLike[T] = null
@@ -1006,10 +1006,10 @@ final class UIDSetLeaf[T <: UID] private[immutable] (
 
 // we wan't to be able to adapt the case class...
 final class UIDSetInnerNode[T <: UID] private[immutable] (
-        protected var theSize:          Int,
-        protected[immutable] var value: T,
-        protected[immutable] var left:  UIDSetNodeLike[T],
-        protected[immutable] var right: UIDSetNodeLike[T]
+    protected var theSize:          Int,
+    protected[immutable] var value: T,
+    protected[immutable] var left:  UIDSetNodeLike[T],
+    protected[immutable] var right: UIDSetNodeLike[T]
 ) extends UIDSetNodeLike[T] {
 
     override def size: Int = theSize
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/immutable/UIDTrieSet.scala b/OPAL/common/src/main/scala/org/opalj/collection/immutable/UIDTrieSet.scala
index da63a2c8d3..3ccb73015a 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/immutable/UIDTrieSet.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/immutable/UIDTrieSet.scala
@@ -200,8 +200,8 @@ final class UIDTrieSet1[T <: UID](val i: T) extends UIDTrieSetLeaf[T] {
  * Represents an ordered set of two values where i1 has to be smaller than i2.
  */
 private[immutable] final class UIDTrieSet2[T <: UID] private[immutable] (
-        val i1: T,
-        val i2: T
+    val i1: T,
+    val i2: T
 ) extends UIDTrieSetLeaf[T] {
 
     override def isEmpty: Boolean = false
@@ -266,9 +266,9 @@ private[immutable] final class UIDTrieSet2[T <: UID] private[immutable] (
  * Represents an ordered set of three int values: i1 < i2 < i3.
  */
 private[immutable] final class UIDTrieSet3[T <: UID] private[immutable] (
-        val i1: T,
-        val i2: T,
-        val i3: T
+    val i1: T,
+    val i2: T,
+    val i3: T
 ) extends UIDTrieSetLeaf[T] {
 
     override def size: Int = 3
@@ -451,8 +451,8 @@ private[immutable] final class UIDTrieSet3[T <: UID] private[immutable] (
  * A UIDTrieSet with four or more values.
  */
 private[immutable] final class UIDTrieSetN[T <: UID](
-        val size: Int,
-        root:     UIDTrieSetNode[T]
+    val size: Int,
+    root:     UIDTrieSetNode[T]
 ) extends UIDTrieSet[T] {
 
     // assert(size >= 4)
@@ -540,9 +540,9 @@ private[immutable] final class UIDTrieSetN[T <: UID](
 }
 
 private[immutable] final class UIDTrieSetNode_0_1[T <: UID](
-        val v:  T, // value with the current prefix...
-        val _0: UIDTrieSetNode[T],
-        val _1: UIDTrieSetNode[T]
+    val v:  T, // value with the current prefix...
+    val _0: UIDTrieSetNode[T],
+    val _1: UIDTrieSetNode[T]
 ) extends UIDTrieSetNode[T] {
 
     override def foreach[U](f: T => U): Unit = { f(v); _0.foreach(f); _1.foreach(f) }
@@ -599,8 +599,8 @@ private[immutable] final class UIDTrieSetNode_0_1[T <: UID](
 }
 
 private[immutable] final class UIDTrieSetNode_0[T <: UID](
-        val v:  T,
-        val _0: UIDTrieSetNode[T]
+    val v:  T,
+    val _0: UIDTrieSetNode[T]
 ) extends UIDTrieSetNode[T] {
 
     override def hashCode: Int = v.id ^ _0.hashCode
@@ -660,8 +660,8 @@ private[immutable] final class UIDTrieSetNode_0[T <: UID](
 }
 
 private[immutable] final class UIDTrieSetNode_1[T <: UID](
-        val v:  T,
-        val _1: UIDTrieSetNode[T]
+    val v:  T,
+    val _1: UIDTrieSetNode[T]
 ) extends UIDTrieSetNode[T] {
 
     override def hashCode: Int = v.id ^ _1.hashCode
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/mutable/FixedSizeBitSet.scala b/OPAL/common/src/main/scala/org/opalj/collection/mutable/FixedSizeBitSet.scala
index c54559c932..9b08942664 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/mutable/FixedSizeBitSet.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/mutable/FixedSizeBitSet.scala
@@ -169,7 +169,7 @@ private[mutable] final class FixedSizeBitSet128 extends FixedSizeBitSet { thisSe
 }
 
 private[mutable] final class FixedSizeBitSetN private[mutable] (
-        private val set: Array[Long]
+    private val set: Array[Long]
 ) extends FixedSizeBitSet { thisSet =>
 
     assert(set.length > 2)
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/mutable/FixedSizedHashIDMap.scala b/OPAL/common/src/main/scala/org/opalj/collection/mutable/FixedSizedHashIDMap.scala
index 5ec75db8ce..9d408f75cf 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/mutable/FixedSizedHashIDMap.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/mutable/FixedSizedHashIDMap.scala
@@ -27,9 +27,9 @@ import scala.collection.immutable.ArraySeq
  * @author Michael Eichberg
  */
 class FixedSizedHashIDMap[K <: AnyRef, V] private (
-        private var theKeys:        Array[K],
-        private var theValues:      Array[V],
-        private var hashCodeOffset: Int // basically -minValue
+    private var theKeys:        Array[K],
+    private var theValues:      Array[V],
+    private var hashCodeOffset: Int // basically -minValue
 ) { self =>
 
     /**
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/mutable/IntArrayStack.scala b/OPAL/common/src/main/scala/org/opalj/collection/mutable/IntArrayStack.scala
index 840ee0d2d1..450457a6f6 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/mutable/IntArrayStack.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/mutable/IntArrayStack.scala
@@ -17,8 +17,8 @@ import scala.collection.mutable
  * @author Michael Eichberg
  */
 final class IntArrayStack private (
-        private var data:  Array[Int],
-        private var size0: Int
+    private var data:  Array[Int],
+    private var size0: Int
 ) extends mutable.IndexedSeq[Int]
     with mutable.IndexedSeqOps[Int, mutable.Stack, IntArrayStack]
     with mutable.Cloneable[IntArrayStack]
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/mutable/IntQueue.scala b/OPAL/common/src/main/scala/org/opalj/collection/mutable/IntQueue.scala
index 5acc2d268e..afe3f1e0b0 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/mutable/IntQueue.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/mutable/IntQueue.scala
@@ -12,8 +12,8 @@ package mutable
  * @author Michael Eichberg
  */
 protected[opalj] final class IntQueue private (
-        private var first: QueueNode = null,
-        private var last:  QueueNode = null
+    private var first: QueueNode = null,
+    private var last:  QueueNode = null
 ) extends Serializable { queue =>
 
     def this(value: Int) = this(new QueueNode(value, null))
diff --git a/OPAL/common/src/main/scala/org/opalj/collection/mutable/RefAccumulator.scala b/OPAL/common/src/main/scala/org/opalj/collection/mutable/RefAccumulator.scala
index 94be50cc6d..cf67d07b8e 100644
--- a/OPAL/common/src/main/scala/org/opalj/collection/mutable/RefAccumulator.scala
+++ b/OPAL/common/src/main/scala/org/opalj/collection/mutable/RefAccumulator.scala
@@ -16,7 +16,7 @@ package mutable
  * @author Michael Eichberg
  */
 final class RefAccumulator[A <: AnyRef] private (
-        private var data: List[AnyRef] // either a value of type A or a non-empty iterator of A
+    private var data: List[AnyRef] // either a value of type A or a non-empty iterator of A
 ) {
 
     def isEmpty: Boolean = data.isEmpty
diff --git a/OPAL/common/src/main/scala/org/opalj/concurrent/OPALThreadPoolExecutor.scala b/OPAL/common/src/main/scala/org/opalj/concurrent/OPALThreadPoolExecutor.scala
index 9a3368e469..b5303f9c70 100644
--- a/OPAL/common/src/main/scala/org/opalj/concurrent/OPALThreadPoolExecutor.scala
+++ b/OPAL/common/src/main/scala/org/opalj/concurrent/OPALThreadPoolExecutor.scala
@@ -25,8 +25,8 @@ import java.util.concurrent.atomic.AtomicLong
  * @author Michael Eichberg
  */
 class OPALBoundedThreadPoolExecutor(
-        n:         Int,
-        val group: ThreadGroup
+    n:         Int,
+    val group: ThreadGroup
 ) extends ThreadPoolExecutor(
         n,
         n,
diff --git a/OPAL/common/src/main/scala/org/opalj/concurrent/Tasks.scala b/OPAL/common/src/main/scala/org/opalj/concurrent/Tasks.scala
index 83efa0b673..8b2d7d60fd 100644
--- a/OPAL/common/src/main/scala/org/opalj/concurrent/Tasks.scala
+++ b/OPAL/common/src/main/scala/org/opalj/concurrent/Tasks.scala
@@ -32,9 +32,9 @@ sealed trait Tasks[T] {
  * @tparam T Type of the processed data.
  */
 final class SequentialTasks[T](
-        val process:                               (Tasks[T], T) => Unit,
-        val abortOnExceptions:                     Boolean       = false,
-        @volatile private[this] var isInterrupted: () => Boolean = () => Thread.currentThread().isInterrupted()
+    val process:                               (Tasks[T], T) => Unit,
+    val abortOnExceptions:                     Boolean       = false,
+    @volatile private[this] var isInterrupted: () => Boolean = () => Thread.currentThread().isInterrupted()
 ) extends Tasks[T] {
 
     private[this] val tasksQueue = scala.collection.mutable.Queue.empty[T]
@@ -106,11 +106,11 @@ final class SequentialTasks[T](
  * @author Michael Eichberg
  */
 final class ConcurrentTasks[T](
-        val process:                               (Tasks[T], T) => Unit,
-        val abortOnExceptions:                     Boolean       = false,
-        @volatile private[this] var isInterrupted: () => Boolean = () => Thread.currentThread().isInterrupted()
+    val process:                               (Tasks[T], T) => Unit,
+    val abortOnExceptions:                     Boolean       = false,
+    @volatile private[this] var isInterrupted: () => Boolean = () => Thread.currentThread().isInterrupted()
 )(
-        implicit val executionContext: ExecutionContext
+    implicit val executionContext: ExecutionContext
 ) extends Tasks[T] { self =>
 
     @volatile private[this] var tasksCount = 0
diff --git a/OPAL/common/src/main/scala/org/opalj/constraints/IncompatibleNumericConstraints.scala b/OPAL/common/src/main/scala/org/opalj/constraints/IncompatibleNumericConstraints.scala
index af692a5781..83fd4cc6e5 100644
--- a/OPAL/common/src/main/scala/org/opalj/constraints/IncompatibleNumericConstraints.scala
+++ b/OPAL/common/src/main/scala/org/opalj/constraints/IncompatibleNumericConstraints.scala
@@ -9,11 +9,11 @@ package constraints
  * @author Michael Eichberg
  */
 case class IncompatibleNumericConstraints(
-        message:            String,
-        constraint1:        NumericConstraint,
-        constraint2:        NumericConstraint,
-        enableSuppression:  Boolean = false,
-        writableStackTrace: Boolean = true
+    message:            String,
+    constraint1:        NumericConstraint,
+    constraint2:        NumericConstraint,
+    enableSuppression:  Boolean = false,
+    writableStackTrace: Boolean = true
 ) extends RuntimeException(
         if (message != null)
             s"$message (incompatible: $constraint1 and $constraint2)"
@@ -25,7 +25,7 @@ case class IncompatibleNumericConstraints(
     ) {
 
     def this(
-            constraint1: NumericConstraint,
-            constraint2: NumericConstraint
+        constraint1: NumericConstraint,
+        constraint2: NumericConstraint
     ) = this(null, constraint1, constraint2)
 }
diff --git a/OPAL/common/src/main/scala/org/opalj/constraints/ValueConstraints.scala b/OPAL/common/src/main/scala/org/opalj/constraints/ValueConstraints.scala
index 67c243e20d..9b9f79450b 100644
--- a/OPAL/common/src/main/scala/org/opalj/constraints/ValueConstraints.scala
+++ b/OPAL/common/src/main/scala/org/opalj/constraints/ValueConstraints.scala
@@ -15,8 +15,8 @@ trait NumericValueConstraint extends ValueConstraint
  * States that the underlying, unknown value is an element of the specified range of values.
  */
 case class NumericRange[@specialized(Int, Long, Float, Double, Boolean) T <: AnyVal](
-        lowerBound: T,
-        upperBound: T
+    lowerBound: T,
+    upperBound: T
 ) extends NumericValueConstraint
 
 object NumericRange {
@@ -27,7 +27,7 @@ object NumericRange {
  * States that the underlying, unknown value is an element of the specified set.
  */
 case class NumericSet[@specialized(Int, Long, Float, Double, Boolean) T <: AnyVal](
-        values: Set[T]
+    values: Set[T]
 ) extends NumericValueConstraint
 
 trait ReferenceValueConstraint extends ValueConstraint
@@ -46,17 +46,17 @@ case object NonNullValue extends ReferenceValueConstraint
  * Models constraints related to an object (graph).
  */
 case class ObjectConstraint(
-        objectReference:  ReferenceValueConstraint,
-        fieldConstraints: Map[String, ValueConstraint]
+    objectReference:  ReferenceValueConstraint,
+    fieldConstraints: Map[String, ValueConstraint]
 ) extends ReferenceValueConstraint
 
 /**
  * @param arrayValues Constraint which is satisified by all elements of the array (on first access).
  */
 case class ArrayConstraint(
-        arrayReference: ReferenceValueConstraint,
-        arraySize:      NumericValueConstraint = NumericRange.PositiveIntegerValue,
-        arrayValues:    ValueConstraint
+    arrayReference: ReferenceValueConstraint,
+    arraySize:      NumericValueConstraint = NumericRange.PositiveIntegerValue,
+    arrayValues:    ValueConstraint
 ) extends ReferenceValueConstraint
 
 object ArrayConstraint {
diff --git a/OPAL/common/src/main/scala/org/opalj/graphs/DefaultMutableNode.scala b/OPAL/common/src/main/scala/org/opalj/graphs/DefaultMutableNode.scala
index 27f3a6f7d1..82997ec855 100644
--- a/OPAL/common/src/main/scala/org/opalj/graphs/DefaultMutableNode.scala
+++ b/OPAL/common/src/main/scala/org/opalj/graphs/DefaultMutableNode.scala
@@ -13,10 +13,10 @@ import scala.collection.immutable
  * @author Michael Eichberg
  */
 class DefaultMutableNode[I](
-        theIdentifier:       I,
-        identifierToString:  I => String                   = (_: Any).toString,
-        theVisualProperties: immutable.Map[String, String] = immutable.Map.empty,
-        theChildren:         List[DefaultMutableNode[I]]   = List.empty
+    theIdentifier:       I,
+    identifierToString:  I => String                   = (_: Any).toString,
+    theVisualProperties: immutable.Map[String, String] = immutable.Map.empty,
+    theChildren:         List[DefaultMutableNode[I]]   = List.empty
 ) extends MutableNodeLike[I, DefaultMutableNode[I]](
         theIdentifier,
         identifierToString,
@@ -25,9 +25,9 @@ class DefaultMutableNode[I](
     ) with MutableNode[I, DefaultMutableNode[I]] {
 
     def this(
-            identifier:         I,
-            identifierToString: I => String,
-            fillcolor:          Option[String]
+        identifier:         I,
+        identifierToString: I => String,
+        fillcolor:          Option[String]
     ) =
         this(
             identifier,
diff --git a/OPAL/common/src/main/scala/org/opalj/graphs/DominanceFrontiers.scala b/OPAL/common/src/main/scala/org/opalj/graphs/DominanceFrontiers.scala
index 1bac693d3d..9ffa3635e9 100644
--- a/OPAL/common/src/main/scala/org/opalj/graphs/DominanceFrontiers.scala
+++ b/OPAL/common/src/main/scala/org/opalj/graphs/DominanceFrontiers.scala
@@ -16,7 +16,7 @@ import org.opalj.collection.mutable.IntArrayStack
  * @author Michael Eichberg
  */
 final class DominanceFrontiers private (
-        private val dfs: Array[IntArraySet] // IMPROVE Consider using an IntTrieSet (if it doesn't work, document it!)
+    private val dfs: Array[IntArraySet] // IMPROVE Consider using an IntTrieSet (if it doesn't work, document it!)
 ) extends ControlDependencies {
 
     def apply(n: Int): IntArraySet = df(n)
diff --git a/OPAL/common/src/main/scala/org/opalj/graphs/DominatorTree.scala b/OPAL/common/src/main/scala/org/opalj/graphs/DominatorTree.scala
index 617c39eb65..976d7cbdbf 100644
--- a/OPAL/common/src/main/scala/org/opalj/graphs/DominatorTree.scala
+++ b/OPAL/common/src/main/scala/org/opalj/graphs/DominatorTree.scala
@@ -18,10 +18,10 @@ import org.opalj.collection.mutable.IntArrayStack
  *         `startNode`.
  */
 final class DominatorTree private (
-        val startNode:            Int,
-        val hasVirtualStartNode:  Boolean,
-        val foreachSuccessorOf:   Int => ((Int => Unit) => Unit),
-        private[graphs] val idom: Array[Int]
+    val startNode:            Int,
+    val hasVirtualStartNode:  Boolean,
+    val foreachSuccessorOf:   Int => ((Int => Unit) => Unit),
+    private[graphs] val idom: Array[Int]
 ) extends AbstractDominatorTree {
 
     def isAugmented: Boolean = hasVirtualStartNode
diff --git a/OPAL/common/src/main/scala/org/opalj/graphs/Graph.scala b/OPAL/common/src/main/scala/org/opalj/graphs/Graph.scala
index cfd66aedd6..a794bb2ecf 100644
--- a/OPAL/common/src/main/scala/org/opalj/graphs/Graph.scala
+++ b/OPAL/common/src/main/scala/org/opalj/graphs/Graph.scala
@@ -21,9 +21,9 @@ import org.opalj.collection.IntIterator
  * @author Michael Eichberg
  */
 class Graph[@specialized(Int) N: ClassTag] private (
-        val vertices:     Set[N],
-        val successors:   LinkedHashMap[N, List[N]],
-        val predecessors: LinkedHashMap[N, List[N]]
+    val vertices:     Set[N],
+    val successors:   LinkedHashMap[N, List[N]],
+    val predecessors: LinkedHashMap[N, List[N]]
 ) extends AbstractGraph[N] {
 
     def apply(s: N): List[N] = successors.getOrElse(s, List.empty)
diff --git a/OPAL/common/src/main/scala/org/opalj/graphs/MutableNodeLike.scala b/OPAL/common/src/main/scala/org/opalj/graphs/MutableNodeLike.scala
index 6cb62d1645..af7af37c9b 100644
--- a/OPAL/common/src/main/scala/org/opalj/graphs/MutableNodeLike.scala
+++ b/OPAL/common/src/main/scala/org/opalj/graphs/MutableNodeLike.scala
@@ -27,10 +27,10 @@ import scala.collection.immutable
  * @author Michael Eichberg
  */
 class MutableNodeLike[I, N <: Node](
-        private[this] var theIdentifier:       I,
-        val identifierToString:                I => String,
-        private[this] var theVisualProperties: immutable.Map[String, String],
-        private[this] var theChildren:         List[N]
+    private[this] var theIdentifier:       I,
+    val identifierToString:                I => String,
+    private[this] var theVisualProperties: immutable.Map[String, String],
+    private[this] var theChildren:         List[N]
 ) extends MutableNode[I, N] {
 
     def identifier: I = this.synchronized(theIdentifier)
diff --git a/OPAL/common/src/main/scala/org/opalj/graphs/PostDominatorTree.scala b/OPAL/common/src/main/scala/org/opalj/graphs/PostDominatorTree.scala
index 2d0dc06698..5fc73e1230 100644
--- a/OPAL/common/src/main/scala/org/opalj/graphs/PostDominatorTree.scala
+++ b/OPAL/common/src/main/scala/org/opalj/graphs/PostDominatorTree.scala
@@ -21,11 +21,11 @@ import org.opalj.collection.immutable.IntTrieSet
  * @param  foreachSuccessorOf The original successor information.
  */
 final class PostDominatorTree private[graphs] (
-        val startNode:            Int,
-        val hasVirtualStartNode:  Boolean,
-        val additionalExitNodes:  IntTrieSet,
-        val foreachSuccessorOf:   Int => ((Int => Unit) => Unit),
-        private[graphs] val idom: Array[Int] // the (post)dominator information
+    val startNode:            Int,
+    val hasVirtualStartNode:  Boolean,
+    val additionalExitNodes:  IntTrieSet,
+    val foreachSuccessorOf:   Int => ((Int => Unit) => Unit),
+    private[graphs] val idom: Array[Int] // the (post)dominator information
 ) extends AbstractDominatorTree {
 
     /**
diff --git a/OPAL/common/src/main/scala/org/opalj/graphs/UnidirectionalGraph.scala b/OPAL/common/src/main/scala/org/opalj/graphs/UnidirectionalGraph.scala
index 43038be411..452d4c54fa 100644
--- a/OPAL/common/src/main/scala/org/opalj/graphs/UnidirectionalGraph.scala
+++ b/OPAL/common/src/main/scala/org/opalj/graphs/UnidirectionalGraph.scala
@@ -22,9 +22,9 @@ import org.opalj.collection.immutable.IntTrieSet
  * @author Michael Eichberg
  */
 class UnidirectionalGraph(
-        val verticesCount: Int
+    val verticesCount: Int
 )( // a graph which contains the nodes with the ids: [0...vertices-1]
-        private val successors: Array[IntTrieSet] = new Array[IntTrieSet](verticesCount)) extends AbstractGraph[Int] {
+    private val successors: Array[IntTrieSet] = new Array[IntTrieSet](verticesCount)) extends AbstractGraph[Int] {
 
     def vertices: Range = (0 until this.verticesCount)
 
diff --git a/OPAL/common/src/main/scala/org/opalj/graphs/VirtualUnidirectionalGraph.scala b/OPAL/common/src/main/scala/org/opalj/graphs/VirtualUnidirectionalGraph.scala
index 97a570d88c..992ecfc6ac 100644
--- a/OPAL/common/src/main/scala/org/opalj/graphs/VirtualUnidirectionalGraph.scala
+++ b/OPAL/common/src/main/scala/org/opalj/graphs/VirtualUnidirectionalGraph.scala
@@ -27,8 +27,8 @@ import org.opalj.collection.IntIterator
  * @author Michael Eichberg
  */
 class VirtualUnidirectionalGraph(
-        val verticesCount: Int,
-        val successors:    Int => IntIterator
+    val verticesCount: Int,
+    val successors:    Int => IntIterator
 ) extends AbstractGraph[Int] {
 
     def vertices: Range = 0 until this.verticesCount
diff --git a/OPAL/common/src/main/scala/org/opalj/io/FailAfterByteArrayOutputStream.scala b/OPAL/common/src/main/scala/org/opalj/io/FailAfterByteArrayOutputStream.scala
index 386b09b647..90b3d3ebb4 100644
--- a/OPAL/common/src/main/scala/org/opalj/io/FailAfterByteArrayOutputStream.scala
+++ b/OPAL/common/src/main/scala/org/opalj/io/FailAfterByteArrayOutputStream.scala
@@ -16,9 +16,9 @@ import java.io.IOException
  * @author Michael Eichberg
  */
 class FailAfterByteArrayOutputStream(
-        failAfter: Int
+    failAfter: Int
 )(
-        initialSize: Int = Math.min(32, failAfter)
+    initialSize: Int = Math.min(32, failAfter)
 ) extends ByteArrayOutputStream(initialSize) {
 
     /**
diff --git a/OPAL/common/src/main/scala/org/opalj/io/OpeningFileFailedException.scala b/OPAL/common/src/main/scala/org/opalj/io/OpeningFileFailedException.scala
index e255800627..4a4820a1f9 100644
--- a/OPAL/common/src/main/scala/org/opalj/io/OpeningFileFailedException.scala
+++ b/OPAL/common/src/main/scala/org/opalj/io/OpeningFileFailedException.scala
@@ -11,6 +11,6 @@ import java.io.File
  * @author Michael Eichberg
  */
 case class OpeningFileFailedException(
-        file:  File,
-        cause: Throwable
+    file:  File,
+    cause: Throwable
 ) extends Exception(s"cannot open file $file", cause)
diff --git a/OPAL/common/src/main/scala/org/opalj/log/ExceptionLogMessage.scala b/OPAL/common/src/main/scala/org/opalj/log/ExceptionLogMessage.scala
index ce3d4cae39..77d8a952bd 100644
--- a/OPAL/common/src/main/scala/org/opalj/log/ExceptionLogMessage.scala
+++ b/OPAL/common/src/main/scala/org/opalj/log/ExceptionLogMessage.scala
@@ -3,10 +3,10 @@ package org.opalj
 package log
 
 case class ExceptionLogMessage(
-        level:       Level          = Info,
-        category:    Option[String] = None,
-        baseMessage: String,
-        t:           Throwable
+    level:       Level          = Info,
+    category:    Option[String] = None,
+    baseMessage: String,
+    t:           Throwable
 ) extends LogMessage {
 
     def message: String = {
diff --git a/OPAL/common/src/main/scala/org/opalj/log/StandardLogMessage.scala b/OPAL/common/src/main/scala/org/opalj/log/StandardLogMessage.scala
index 17f5e643be..1dd2562e0f 100644
--- a/OPAL/common/src/main/scala/org/opalj/log/StandardLogMessage.scala
+++ b/OPAL/common/src/main/scala/org/opalj/log/StandardLogMessage.scala
@@ -8,7 +8,7 @@ package log
  * @author Michael Eichberg
  */
 case class StandardLogMessage(
-        level:    Level          = Info,
-        category: Option[String] = None,
-        message:  String
+    level:    Level          = Info,
+    category: Option[String] = None,
+    message:  String
 ) extends LogMessage
diff --git a/OPAL/common/src/main/scala/org/opalj/util/InMemoryClassLoader.scala b/OPAL/common/src/main/scala/org/opalj/util/InMemoryClassLoader.scala
index f9059089db..f06205b32d 100644
--- a/OPAL/common/src/main/scala/org/opalj/util/InMemoryClassLoader.scala
+++ b/OPAL/common/src/main/scala/org/opalj/util/InMemoryClassLoader.scala
@@ -12,8 +12,8 @@ package util
  * @author  Michael Eichberg
  */
 class InMemoryClassLoader(
-        private[this] var rawClasses: Map[String, Array[Byte]],
-        parent:                       ClassLoader = ClassLoader.getSystemClassLoader
+    private[this] var rawClasses: Map[String, Array[Byte]],
+    parent:                       ClassLoader = ClassLoader.getSystemClassLoader
 ) extends ClassLoader(parent) {
 
     /**
diff --git a/OPAL/da/src/main/scala/org/opalj/da/Annotation.scala b/OPAL/da/src/main/scala/org/opalj/da/Annotation.scala
index 0201d22d33..3dd0cb29da 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/Annotation.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/Annotation.scala
@@ -11,8 +11,8 @@ import scala.xml.Node
  * @author Noorulla Sharief
  */
 case class Annotation(
-        type_index:          Constant_Pool_Index,
-        element_value_pairs: ElementValuePairs = NoElementValuePairs
+    type_index:          Constant_Pool_Index,
+    element_value_pairs: ElementValuePairs = NoElementValuePairs
 ) extends AbstractAnnotation {
 
     final def attribute_length: Int = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/AnnotationDefault_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/AnnotationDefault_attribute.scala
index 21431181d7..93e4fc0ccd 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/AnnotationDefault_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/AnnotationDefault_attribute.scala
@@ -11,8 +11,8 @@ import scala.xml.Node
  * @author Noorulla Sharief
  */
 case class AnnotationDefault_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        element_value:        ElementValue
+    attribute_name_index: Constant_Pool_Index,
+    element_value:        ElementValue
 ) extends Attribute {
 
     final def attribute_length: Int = element_value.attribute_length
diff --git a/OPAL/da/src/main/scala/org/opalj/da/BootstrapMethods_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/BootstrapMethods_attribute.scala
index 2dac7ff9db..c6b9f1bde2 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/BootstrapMethods_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/BootstrapMethods_attribute.scala
@@ -8,8 +8,8 @@ import scala.xml.Node
  * @author Michael Eichberg
  */
 case class BootstrapMethods_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        bootstrap_methods:    Seq[BootstrapMethod]
+    attribute_name_index: Constant_Pool_Index,
+    bootstrap_methods:    Seq[BootstrapMethod]
 ) extends Attribute {
 
     override def attribute_length: Int = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_Dynamic_info.scala b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_Dynamic_info.scala
index 1fa11ee5d2..b582e2ddf5 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_Dynamic_info.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_Dynamic_info.scala
@@ -12,8 +12,8 @@ import org.opalj.bi.ConstantPoolTag
  * @author Dominik Helm
  */
 case class CONSTANT_Dynamic_info(
-        bootstrap_method_attr_index: Int,
-        name_and_type_index:         Constant_Pool_Index
+    bootstrap_method_attr_index: Int,
+    name_and_type_index:         Constant_Pool_Index
 ) extends Constant_Pool_Entry {
 
     override final def size: Int = 1 + 2 + 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_Fieldref_info.scala b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_Fieldref_info.scala
index b839b9e265..005ea36efe 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_Fieldref_info.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_Fieldref_info.scala
@@ -10,8 +10,8 @@ import org.opalj.bi.ConstantPoolTag
  * @author Michael Eichberg
  */
 case class CONSTANT_Fieldref_info(
-        class_index:         Constant_Pool_Index,
-        name_and_type_index: Constant_Pool_Index
+    class_index:         Constant_Pool_Index,
+    name_and_type_index: Constant_Pool_Index
 ) extends CONSTANT_Ref {
 
     override def Constant_Type_Value: ConstantPoolTag = bi.ConstantPoolTags.CONSTANT_Fieldref
diff --git a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_InterfaceMethodref_info.scala b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_InterfaceMethodref_info.scala
index c3a5fabab0..a3b6bb63c3 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_InterfaceMethodref_info.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_InterfaceMethodref_info.scala
@@ -10,8 +10,8 @@ import org.opalj.bi.ConstantPoolTag
  * @author Michael Eichberg
  */
 case class CONSTANT_InterfaceMethodref_info(
-        class_index:         Constant_Pool_Index,
-        name_and_type_index: Constant_Pool_Index
+    class_index:         Constant_Pool_Index,
+    name_and_type_index: Constant_Pool_Index
 ) extends CONSTANT_Ref {
 
     override def Constant_Type_Value: ConstantPoolTag = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_InvokeDynamic_info.scala b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_InvokeDynamic_info.scala
index 5a5e831c0f..fa2f9922f8 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_InvokeDynamic_info.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_InvokeDynamic_info.scala
@@ -12,8 +12,8 @@ import org.opalj.bi.ConstantPoolTag
  * @author Michael Eichberg
  */
 case class CONSTANT_InvokeDynamic_info(
-        bootstrap_method_attr_index: Int,
-        name_and_type_index:         Constant_Pool_Index
+    bootstrap_method_attr_index: Int,
+    name_and_type_index:         Constant_Pool_Index
 ) extends Constant_Pool_Entry {
 
     override final def size: Int = 1 + 2 + 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_MethodHandle_info.scala b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_MethodHandle_info.scala
index 985cd07ebe..cc4217a612 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_MethodHandle_info.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_MethodHandle_info.scala
@@ -11,8 +11,8 @@ import org.opalj.bi.ConstantPoolTag
  * @author Michael Eichberg
  */
 case class CONSTANT_MethodHandle_info(
-        reference_kind:  Int,
-        reference_index: Constant_Pool_Index
+    reference_kind:  Int,
+    reference_index: Constant_Pool_Index
 ) extends Constant_Pool_Entry {
 
     override final def size: Int = 1 + 1 + 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_MethodType_info.scala b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_MethodType_info.scala
index 46fdd35c96..cd8ab41b77 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_MethodType_info.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_MethodType_info.scala
@@ -12,7 +12,7 @@ import org.opalj.bi.ConstantPoolTags
  * @author Michael Eichberg
  */
 case class CONSTANT_MethodType_info(
-        descriptor_index: Constant_Pool_Index
+    descriptor_index: Constant_Pool_Index
 ) extends Constant_Pool_Entry {
 
     override final def size: Int = 1 + 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_Methodref_info.scala b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_Methodref_info.scala
index 1e6b978393..83af2495a1 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_Methodref_info.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_Methodref_info.scala
@@ -10,8 +10,8 @@ import org.opalj.bi.ConstantPoolTag
  * @author Michael Eichberg
  */
 case class CONSTANT_Methodref_info(
-        class_index:         Constant_Pool_Index,
-        name_and_type_index: Constant_Pool_Index
+    class_index:         Constant_Pool_Index,
+    name_and_type_index: Constant_Pool_Index
 ) extends CONSTANT_Ref {
 
     override def Constant_Type_Value: ConstantPoolTag = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_NameAndType_info.scala b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_NameAndType_info.scala
index 7f5d34816f..c0c84416f9 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_NameAndType_info.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/CONSTANT_NameAndType_info.scala
@@ -12,8 +12,8 @@ import org.opalj.bi.ConstantPoolTag
  * @author Michael Eichberg
  */
 case class CONSTANT_NameAndType_info(
-        name_index:       Constant_Pool_Index,
-        descriptor_index: Constant_Pool_Index
+    name_index:       Constant_Pool_Index,
+    descriptor_index: Constant_Pool_Index
 ) extends Constant_Pool_Entry {
 
     override final def size: Int = 1 + 2 + 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/ClassFile.scala b/OPAL/da/src/main/scala/org/opalj/da/ClassFile.scala
index 147e925f4f..2403a0cf58 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/ClassFile.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/ClassFile.scala
@@ -22,16 +22,16 @@ import org.opalj.io.process
  * @author Andre Pacak
  */
 case class ClassFile(
-        constant_pool: Constant_Pool,
-        minor_version: Int,
-        major_version: Int,
-        access_flags:  Int        = ACC_PUBLIC.mask | ACC_SUPER.mask,
-        this_class:    Constant_Pool_Index,
-        super_class:   Constant_Pool_Index,
-        interfaces:    Interfaces = NoInterfaces,
-        fields:        Fields     = NoFields,
-        methods:       Methods    = NoMethods,
-        attributes:    Attributes = NoAttributes
+    constant_pool: Constant_Pool,
+    minor_version: Int,
+    major_version: Int,
+    access_flags:  Int        = ACC_PUBLIC.mask | ACC_SUPER.mask,
+    this_class:    Constant_Pool_Index,
+    super_class:   Constant_Pool_Index,
+    interfaces:    Interfaces = NoInterfaces,
+    fields:        Fields     = NoFields,
+    methods:       Methods    = NoMethods,
+    attributes:    Attributes = NoAttributes
 ) {
 
     assert({
diff --git a/OPAL/da/src/main/scala/org/opalj/da/Code_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/Code_attribute.scala
index 40b57d2183..13984cfdec 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/Code_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/Code_attribute.scala
@@ -13,12 +13,12 @@ import scala.xml.NodeSeq
  * @author Andre Pacak
  */
 case class Code_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        max_stack:            Int,
-        max_locals:           Int,
-        code:                 Code,
-        exceptionTable:       ExceptionTable = NoExceptionTable,
-        attributes:           Attributes     = NoAttributes
+    attribute_name_index: Constant_Pool_Index,
+    max_stack:            Int,
+    max_locals:           Int,
+    code:                 Code,
+    exceptionTable:       ExceptionTable = NoExceptionTable,
+    attributes:           Attributes     = NoAttributes
 ) extends Attribute {
 
     override def attribute_length: Int = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/ConstantValue_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/ConstantValue_attribute.scala
index fbe50140a6..72eaf141e6 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/ConstantValue_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/ConstantValue_attribute.scala
@@ -11,8 +11,8 @@ import scala.xml.Node
  * @author Noorulla Sharief
  */
 case class ConstantValue_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        constantValue_index:  Constant_Pool_Index
+    attribute_name_index: Constant_Pool_Index,
+    constantValue_index:  Constant_Pool_Index
 ) extends Attribute {
 
     override final def attribute_length = 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/ElementValue.scala b/OPAL/da/src/main/scala/org/opalj/da/ElementValue.scala
index e3713406ed..6d9ab62835 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/ElementValue.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/ElementValue.scala
@@ -106,8 +106,8 @@ object ClassValue { final val tag: Int = 'c' }
 trait StructuredElementValue extends ElementValue
 
 case class EnumValue(
-        type_name_index:  Constant_Pool_Index,
-        const_name_index: Constant_Pool_Index
+    type_name_index:  Constant_Pool_Index,
+    const_name_index: Constant_Pool_Index
 ) extends StructuredElementValue {
     override final def attribute_length: Int = 1 + 2 + 2
 
diff --git a/OPAL/da/src/main/scala/org/opalj/da/ElementValuePair.scala b/OPAL/da/src/main/scala/org/opalj/da/ElementValuePair.scala
index 9f97efefeb..29b351e436 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/ElementValuePair.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/ElementValuePair.scala
@@ -13,8 +13,8 @@ import scala.xml.Text
  * @author Andre Pacak
  */
 case class ElementValuePair(
-        element_name_index: Constant_Pool_Index,
-        element_value:      ElementValue
+    element_name_index: Constant_Pool_Index,
+    element_value:      ElementValue
 ) {
 
     final def attribute_length: Int = 2 + element_value.attribute_length
diff --git a/OPAL/da/src/main/scala/org/opalj/da/EnclosingMethod_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/EnclosingMethod_attribute.scala
index c63e549667..34a3cb901c 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/EnclosingMethod_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/EnclosingMethod_attribute.scala
@@ -11,9 +11,9 @@ import scala.xml.Node
  * @author Noorulla Sharief
  */
 case class EnclosingMethod_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        class_index:          Constant_Pool_Index,
-        method_index:         Constant_Pool_Index
+    attribute_name_index: Constant_Pool_Index,
+    class_index:          Constant_Pool_Index,
+    method_index:         Constant_Pool_Index
 ) extends Attribute {
 
     override final def attribute_length = 2 + 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/ExceptionTableEntry.scala b/OPAL/da/src/main/scala/org/opalj/da/ExceptionTableEntry.scala
index d4398af871..840efa9220 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/ExceptionTableEntry.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/ExceptionTableEntry.scala
@@ -13,10 +13,10 @@ import org.opalj.bytecode.PC
  * @author Noorulla Sharief
  */
 case class ExceptionTableEntry(
-        start_pc:   PC,
-        end_pc:     PC,
-        handler_pc: PC,
-        catch_type: Int
+    start_pc:   PC,
+    end_pc:     PC,
+    handler_pc: PC,
+    catch_type: Int
 ) {
 
     def toXHTML(implicit cp: Constant_Pool): Node = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/Exceptions_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/Exceptions_attribute.scala
index 88e0f919b2..2dbb3df7bb 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/Exceptions_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/Exceptions_attribute.scala
@@ -18,8 +18,8 @@ import scala.xml.Text
  * @author Michael Eichberg
  */
 case class Exceptions_attribute(
-        attribute_name_index:  Constant_Pool_Index,
-        exception_index_table: ExceptionIndexTable
+    attribute_name_index:  Constant_Pool_Index,
+    exception_index_table: ExceptionIndexTable
 ) extends Attribute {
 
     override final def attribute_length: Int = 2 /*table_size*/ + exception_index_table.size * 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/Field_Info.scala b/OPAL/da/src/main/scala/org/opalj/da/Field_Info.scala
index 3f07bf9af8..97198ed7cf 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/Field_Info.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/Field_Info.scala
@@ -15,10 +15,10 @@ import org.opalj.bi.AccessFlagsContexts.FIELD
  * @author Andre Pacak
  */
 case class Field_Info(
-        access_flags:     Int,
-        name_index:       Constant_Pool_Index,
-        descriptor_index: Constant_Pool_Index,
-        attributes:       Attributes = NoAttributes
+    access_flags:     Int,
+    name_index:       Constant_Pool_Index,
+    descriptor_index: Constant_Pool_Index,
+    attributes:       Attributes = NoAttributes
 ) extends ClassMember {
 
     def size: Int = 2 + 2 + 2 + 2 /* attributes_count*/ + attributes.view.map(_.size).sum
diff --git a/OPAL/da/src/main/scala/org/opalj/da/InnerClassesEntry.scala b/OPAL/da/src/main/scala/org/opalj/da/InnerClassesEntry.scala
index 42d249c6ab..cb7c7a5d2e 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/InnerClassesEntry.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/InnerClassesEntry.scala
@@ -14,10 +14,10 @@ import org.opalj.bi.AccessFlagsContexts
  * @author Noorulla Sharief
  */
 case class InnerClassesEntry(
-        inner_class_info_index:   Int,
-        outer_class_info_index:   Int,
-        inner_name_index:         Int,
-        inner_class_access_flags: Int
+    inner_class_info_index:   Int,
+    outer_class_info_index:   Int,
+    inner_name_index:         Int,
+    inner_class_access_flags: Int
 ) {
 
     def toXHTML(definingClass: FieldTypeInfo)(implicit cp: Constant_Pool): Node = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/InnerClasses_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/InnerClasses_attribute.scala
index 857a34ce16..900cd7c053 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/InnerClasses_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/InnerClasses_attribute.scala
@@ -25,8 +25,8 @@ import scala.xml.Node
  * @author Andre Pacak
  */
 case class InnerClasses_attribute(
-        attribute_name_index: Int,
-        classes:              Seq[InnerClassesEntry]
+    attribute_name_index: Int,
+    classes:              Seq[InnerClassesEntry]
 ) extends Attribute {
 
     override final def attribute_length = 2 + (classes.size * 8)
diff --git a/OPAL/da/src/main/scala/org/opalj/da/LineNumberTableEntry.scala b/OPAL/da/src/main/scala/org/opalj/da/LineNumberTableEntry.scala
index ad3bf70e0f..bfa7450a36 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/LineNumberTableEntry.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/LineNumberTableEntry.scala
@@ -11,8 +11,8 @@ import scala.xml.Node
  * @author Noorulla Sharief
  */
 case class LineNumberTableEntry(
-        start_pc:    Int,
-        line_number: Int
+    start_pc:    Int,
+    line_number: Int
 ) {
 
     def toXHTML(): Node = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/LineNumberTable_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/LineNumberTable_attribute.scala
index 5da97c4765..f3d133afa9 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/LineNumberTable_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/LineNumberTable_attribute.scala
@@ -11,8 +11,8 @@ import scala.xml.Node
  * @author Noorulla Sharief
  */
 case class LineNumberTable_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        line_number_table:    Seq[LineNumberTableEntry]
+    attribute_name_index: Constant_Pool_Index,
+    line_number_table:    Seq[LineNumberTableEntry]
 ) extends Attribute {
 
     override final def attribute_length: Int = 2 + line_number_table.size * 4
diff --git a/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTableEntry.scala b/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTableEntry.scala
index 42fa1d60e8..eedabca62c 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTableEntry.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTableEntry.scala
@@ -12,11 +12,11 @@ import scala.xml.Node
  * @author Tobias Becker
  */
 case class LocalVariableTableEntry(
-        start_pc:         Int,
-        length:           Int,
-        name_index:       Constant_Pool_Index,
-        descriptor_index: Constant_Pool_Index,
-        index:            Int
+    start_pc:         Int,
+    length:           Int,
+    name_index:       Constant_Pool_Index,
+    descriptor_index: Constant_Pool_Index,
+    index:            Int
 ) {
 
     def toXHTML(implicit cp: Constant_Pool): Node = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTable_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTable_attribute.scala
index 0d7e7bafe2..ecc3f1d369 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTable_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTable_attribute.scala
@@ -12,8 +12,8 @@ import scala.xml.Text
  * @author Noorulla Sharief
  */
 case class LocalVariableTable_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        local_variable_table: Seq[LocalVariableTableEntry]
+    attribute_name_index: Constant_Pool_Index,
+    local_variable_table: Seq[LocalVariableTableEntry]
 ) extends Attribute {
 
     override final def attribute_length: Int = 2 + (local_variable_table.size * 10)
diff --git a/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTypeTableEntry.scala b/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTypeTableEntry.scala
index 49a5a10c0a..d0be878258 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTypeTableEntry.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTypeTableEntry.scala
@@ -12,11 +12,11 @@ import scala.xml.Node
  * @author Andre Pacak
  */
 case class LocalVariableTypeTableEntry(
-        start_pc:        Int,
-        length:          Int,
-        name_index:      Constant_Pool_Index,
-        signature_index: Constant_Pool_Index,
-        index:           Int
+    start_pc:        Int,
+    length:          Int,
+    name_index:      Constant_Pool_Index,
+    signature_index: Constant_Pool_Index,
+    index:           Int
 ) {
 
     def toXHTML(implicit cp: Constant_Pool): Node = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTypeTable_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTypeTable_attribute.scala
index 178f0ffded..677dee22c5 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTypeTable_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/LocalVariableTypeTable_attribute.scala
@@ -12,8 +12,8 @@ import scala.xml.Node
  * @author Andre Pacak
  */
 case class LocalVariableTypeTable_attribute(
-        attribute_name_index:      Constant_Pool_Index,
-        local_variable_type_table: Seq[LocalVariableTypeTableEntry]
+    attribute_name_index:      Constant_Pool_Index,
+    local_variable_type_table: Seq[LocalVariableTypeTableEntry]
 ) extends Attribute {
 
     override final def attribute_length: Int = 2 + (local_variable_type_table.size * 10)
diff --git a/OPAL/da/src/main/scala/org/opalj/da/MethodParameters_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/MethodParameters_attribute.scala
index 33a13ddee4..0ffb49b3ad 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/MethodParameters_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/MethodParameters_attribute.scala
@@ -14,8 +14,8 @@ import org.opalj.bi.AccessFlagsContexts.METHOD_PARAMETERS
  * @author Noorulla Sharief
  */
 case class MethodParameters_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        parameters:           ArraySeq[MethodParameter]
+    attribute_name_index: Constant_Pool_Index,
+    parameters:           ArraySeq[MethodParameter]
 ) extends Attribute {
 
     override final def attribute_length: Int = 1 /*parameters_count*/ + parameters.size * 4
@@ -31,8 +31,8 @@ case class MethodParameters_attribute(
 }
 
 case class MethodParameter(
-        name_index:   Constant_Pool_Index,
-        access_flags: Int
+    name_index:   Constant_Pool_Index,
+    access_flags: Int
 ) {
 
     def toXHTML(implicit cp: Constant_Pool): Seq[Node] = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/Method_Info.scala b/OPAL/da/src/main/scala/org/opalj/da/Method_Info.scala
index efa3ff1590..e2bd5e651e 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/Method_Info.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/Method_Info.scala
@@ -16,10 +16,10 @@ import org.opalj.bi.AccessFlagsContexts.METHOD
  * @author Andre Pacak
  */
 case class Method_Info(
-        access_flags:     Int,
-        name_index:       Constant_Pool_Index,
-        descriptor_index: Constant_Pool_Index,
-        attributes:       Attributes = NoAttributes
+    access_flags:     Int,
+    name_index:       Constant_Pool_Index,
+    descriptor_index: Constant_Pool_Index,
+    attributes:       Attributes = NoAttributes
 ) extends ClassMember {
 
     /**
diff --git a/OPAL/da/src/main/scala/org/opalj/da/ModuleMainClass_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/ModuleMainClass_attribute.scala
index c2523632d6..08f06435d1 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/ModuleMainClass_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/ModuleMainClass_attribute.scala
@@ -10,8 +10,8 @@ import scala.xml.Node
  * @author Michael Eichberg
  */
 case class ModuleMainClass_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        main_class_index:     Constant_Pool_Index // CONSTANT_CLASS
+    attribute_name_index: Constant_Pool_Index,
+    main_class_index:     Constant_Pool_Index // CONSTANT_CLASS
 ) extends Attribute {
 
     def attribute_length: Int = 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/ModulePackages_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/ModulePackages_attribute.scala
index c9ec4f6912..468c3fd40f 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/ModulePackages_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/ModulePackages_attribute.scala
@@ -11,8 +11,8 @@ import scala.xml.NodeBuffer
  * @author Michael Eichberg
  */
 case class ModulePackages_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        package_index_table:  PackageIndexTable // Array[Constant_Pool_Index]
+    attribute_name_index: Constant_Pool_Index,
+    package_index_table:  PackageIndexTable // Array[Constant_Pool_Index]
 ) extends Attribute {
 
     override def attribute_length: Int = 2 + package_index_table.size * 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/Module_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/Module_attribute.scala
index cf5a3fc089..6715fb7b00 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/Module_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/Module_attribute.scala
@@ -15,15 +15,15 @@ import org.opalj.bi.AccessFlagsContexts.MODULE
  * @author Michael Eichberg
  */
 case class Module_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        module_name_index:    Constant_Pool_Index,
-        module_flags:         Int,
-        module_version_index: Constant_Pool_Index, // can be "0"!
-        requires:             Requires,
-        exports:              Exports,
-        opens:                Opens,
-        uses:                 Uses,
-        provides:             Provides
+    attribute_name_index: Constant_Pool_Index,
+    module_name_index:    Constant_Pool_Index,
+    module_flags:         Int,
+    module_version_index: Constant_Pool_Index, // can be "0"!
+    requires:             Requires,
+    exports:              Exports,
+    opens:                Opens,
+    uses:                 Uses,
+    provides:             Provides
 ) extends Attribute {
 
     def attribute_length: Int = {
@@ -79,9 +79,9 @@ case class Module_attribute(
 }
 
 case class RequiresEntry(
-        requires_index:         Constant_Pool_Index,
-        requires_flags:         Int,
-        requires_version_index: Constant_Pool_Index // can be "0" (<=> no version...)
+    requires_index:         Constant_Pool_Index,
+    requires_flags:         Int,
+    requires_version_index: Constant_Pool_Index // can be "0" (<=> no version...)
 ) {
 
     def toString(implicit cp: Constant_Pool): String = {
@@ -99,9 +99,9 @@ case class RequiresEntry(
 }
 
 case class ExportsEntry(
-        exports_index:          Constant_Pool_Index,
-        exports_flags:          Int,
-        exports_to_index_table: ExportsToIndexTable
+    exports_index:          Constant_Pool_Index,
+    exports_flags:          Int,
+    exports_to_index_table: ExportsToIndexTable
 ) {
 
     def attribute_length: Int = 6 + exports_to_index_table.size * 2
@@ -124,9 +124,9 @@ case class ExportsEntry(
 }
 
 case class OpensEntry(
-        opens_index:          Constant_Pool_Index,
-        opens_flags:          Int,
-        opens_to_index_table: OpensToIndexTable
+    opens_index:          Constant_Pool_Index,
+    opens_flags:          Int,
+    opens_to_index_table: OpensToIndexTable
 ) {
 
     def attribute_length: Int = 6 + opens_to_index_table.size * 2
@@ -145,8 +145,8 @@ case class OpensEntry(
 }
 
 case class ProvidesEntry(
-        provides_index:            Constant_Pool_Index,
-        provides_with_index_table: ProvidesWithIndexTable
+    provides_index:            Constant_Pool_Index,
+    provides_with_index_table: ProvidesWithIndexTable
 ) {
 
     def attribute_length: Int = 4 + provides_with_index_table.size * 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/NestHost_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/NestHost_attribute.scala
index ba189d3858..28118a74fc 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/NestHost_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/NestHost_attribute.scala
@@ -10,8 +10,8 @@ import scala.xml.Node
  * @author Dominik Helm
  */
 case class NestHost_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        host_class_index:     Constant_Pool_Index // CONSTANT_CLASS
+    attribute_name_index: Constant_Pool_Index,
+    host_class_index:     Constant_Pool_Index // CONSTANT_CLASS
 ) extends Attribute {
 
     def attribute_length: Int = 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/NestMembers_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/NestMembers_attribute.scala
index 41413da91c..453bc97c1c 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/NestMembers_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/NestMembers_attribute.scala
@@ -11,8 +11,8 @@ import scala.xml.NodeBuffer
  * @author Dominik Helm
  */
 case class NestMembers_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        classes_array:        ClassesArray // Array[Constant_Pool_Index]
+    attribute_name_index: Constant_Pool_Index,
+    classes_array:        ClassesArray // Array[Constant_Pool_Index]
 ) extends Attribute {
 
     override final def attribute_length: Int = 2 + classes_array.size * 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/PermittedSubclasses_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/PermittedSubclasses_attribute.scala
index da4a44aae1..d713ddcf6b 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/PermittedSubclasses_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/PermittedSubclasses_attribute.scala
@@ -11,8 +11,8 @@ import scala.xml.NodeBuffer
  * @author Julius Naeumann
  */
 case class PermittedSubclasses_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        permitted_subclasses: ClassesArray
+    attribute_name_index: Constant_Pool_Index,
+    permitted_subclasses: ClassesArray
 ) extends Attribute {
 
     override final def attribute_length: Int = 2 + permitted_subclasses.size * 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/Record_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/Record_attribute.scala
index cf8e2957d8..a3bed3c530 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/Record_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/Record_attribute.scala
@@ -10,8 +10,8 @@ import scala.xml.Node
  * @author Dominik Helm
  */
 case class Record_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        components:           RecordComponents // ArraySeq[Constant_Pool_Index]
+    attribute_name_index: Constant_Pool_Index,
+    components:           RecordComponents // ArraySeq[Constant_Pool_Index]
 ) extends Attribute {
 
     override final def attribute_length: Int = 2 + components.iterator.map(_.length).sum
@@ -26,9 +26,9 @@ case class Record_attribute(
 }
 
 case class RecordComponent(
-        name_index:       Constant_Pool_Index,
-        descriptor_index: Constant_Pool_Index,
-        attributes:       Attributes
+    name_index:       Constant_Pool_Index,
+    descriptor_index: Constant_Pool_Index,
+    attributes:       Attributes
 ) {
 
     def length: Int = 6 + attributes.iterator.map(_.size).sum
diff --git a/OPAL/da/src/main/scala/org/opalj/da/RuntimeInvisibleAnnotations_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/RuntimeInvisibleAnnotations_attribute.scala
index a7b58023a5..902f1466a3 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/RuntimeInvisibleAnnotations_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/RuntimeInvisibleAnnotations_attribute.scala
@@ -11,8 +11,8 @@ import scala.xml.Node
  * @author Noorulla Sharief
  */
 case class RuntimeInvisibleAnnotations_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        annotations:          Annotations
+    attribute_name_index: Constant_Pool_Index,
+    annotations:          Annotations
 ) extends Annotations_attribute {
 
     override final def attribute_length: Int = annotations.foldLeft(2 /*count*/ )(_ + _.attribute_length)
diff --git a/OPAL/da/src/main/scala/org/opalj/da/RuntimeInvisibleParameterAnnotations_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/RuntimeInvisibleParameterAnnotations_attribute.scala
index f4cde70285..1127619f9d 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/RuntimeInvisibleParameterAnnotations_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/RuntimeInvisibleParameterAnnotations_attribute.scala
@@ -12,8 +12,8 @@ import scala.xml.Node
  * @author Andre Pacak
  */
 case class RuntimeInvisibleParameterAnnotations_attribute(
-        attribute_name_index:   Constant_Pool_Index,
-        parameters_annotations: ParametersAnnotations
+    attribute_name_index:   Constant_Pool_Index,
+    parameters_annotations: ParametersAnnotations
 ) extends ParametersAnnotations_attribute {
 
     override final def toXHTML(implicit cp: Constant_Pool): Node = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/RuntimeInvisibleTypeAnnotations_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/RuntimeInvisibleTypeAnnotations_attribute.scala
index c12f015be7..e8e0e395ff 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/RuntimeInvisibleTypeAnnotations_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/RuntimeInvisibleTypeAnnotations_attribute.scala
@@ -12,8 +12,8 @@ import scala.xml.Node
  * @author Andre Pacak
  */
 case class RuntimeInvisibleTypeAnnotations_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        typeAnnotations:      TypeAnnotations
+    attribute_name_index: Constant_Pool_Index,
+    typeAnnotations:      TypeAnnotations
 ) extends TypeAnnotations_attribute {
 
     override final def toXHTML(implicit cp: Constant_Pool): Node = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/RuntimeVisibleAnnotations_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/RuntimeVisibleAnnotations_attribute.scala
index e1347dbc49..75f03124f5 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/RuntimeVisibleAnnotations_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/RuntimeVisibleAnnotations_attribute.scala
@@ -11,8 +11,8 @@ import scala.xml.Node
  * @author Noorulla Sharief
  */
 case class RuntimeVisibleAnnotations_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        annotations:          Annotations
+    attribute_name_index: Constant_Pool_Index,
+    annotations:          Annotations
 ) extends Annotations_attribute {
 
     override final def attribute_length: Int = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/RuntimeVisibleParameterAnnotations_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/RuntimeVisibleParameterAnnotations_attribute.scala
index 3c152e746f..5faa5d5ac1 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/RuntimeVisibleParameterAnnotations_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/RuntimeVisibleParameterAnnotations_attribute.scala
@@ -12,8 +12,8 @@ import scala.xml.Node
  * @author Andre Pacak
  */
 case class RuntimeVisibleParameterAnnotations_attribute(
-        attribute_name_index:   Constant_Pool_Index,
-        parameters_annotations: ParametersAnnotations
+    attribute_name_index:   Constant_Pool_Index,
+    parameters_annotations: ParametersAnnotations
 ) extends ParametersAnnotations_attribute {
 
     override final def toXHTML(implicit cp: Constant_Pool): Node = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/RuntimeVisibleTypeAnnotations_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/RuntimeVisibleTypeAnnotations_attribute.scala
index f5c337cadc..c3f67ce993 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/RuntimeVisibleTypeAnnotations_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/RuntimeVisibleTypeAnnotations_attribute.scala
@@ -12,8 +12,8 @@ import scala.xml.Node
  * @author Andre Pacak
  */
 case class RuntimeVisibleTypeAnnotations_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        typeAnnotations:      TypeAnnotations
+    attribute_name_index: Constant_Pool_Index,
+    typeAnnotations:      TypeAnnotations
 ) extends TypeAnnotations_attribute {
 
     override final def toXHTML(implicit cp: Constant_Pool): Node = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/Signature_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/Signature_attribute.scala
index 076a0fec1c..2158f17689 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/Signature_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/Signature_attribute.scala
@@ -12,8 +12,8 @@ import scala.xml.Node
  * @author Andre Pacak
  */
 case class Signature_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        signature_index:      Constant_Pool_Index
+    attribute_name_index: Constant_Pool_Index,
+    signature_index:      Constant_Pool_Index
 ) extends Attribute {
 
     /**
diff --git a/OPAL/da/src/main/scala/org/opalj/da/SourceDebugExtension_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/SourceDebugExtension_attribute.scala
index 0cc3339123..89a5814091 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/SourceDebugExtension_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/SourceDebugExtension_attribute.scala
@@ -11,8 +11,8 @@ import scala.xml.Node
  * @author Noorulla Sharief
  */
 case class SourceDebugExtension_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        debug_extension:      Array[Byte]
+    attribute_name_index: Constant_Pool_Index,
+    debug_extension:      Array[Byte]
 ) extends Attribute {
 
     override final def attribute_length = debug_extension.length
diff --git a/OPAL/da/src/main/scala/org/opalj/da/SourceFile_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/SourceFile_attribute.scala
index fc874f9670..78358fe69b 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/SourceFile_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/SourceFile_attribute.scala
@@ -12,8 +12,8 @@ import scala.xml.Node
  * @author Andre Pacak
  */
 case class SourceFile_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        sourceFile_index:     Constant_Pool_Index
+    attribute_name_index: Constant_Pool_Index,
+    sourceFile_index:     Constant_Pool_Index
 ) extends Attribute {
 
     override final def attribute_length = 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/StackMapFrame.scala b/OPAL/da/src/main/scala/org/opalj/da/StackMapFrame.scala
index c162098aec..84de10607d 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/StackMapFrame.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/StackMapFrame.scala
@@ -71,8 +71,8 @@ case class SameFrame(frame_type: Int) extends StackMapFrame {
 }
 
 case class SameLocals1StackItemFrame(
-        frame_type:                   Int,
-        verification_type_info_stack: VerificationTypeInfo
+    frame_type:                   Int,
+    verification_type_info_stack: VerificationTypeInfo
 ) extends StackMapFrame {
 
     override final def attribute_length: Int = 1 + verification_type_info_stack.attribute_length
@@ -101,9 +101,9 @@ case class SameLocals1StackItemFrame(
 }
 
 case class SameLocals1StackItemFrameExtended(
-        frame_type:                   Int = 247,
-        offset_delta:                 Int,
-        verification_type_info_stack: VerificationTypeInfo
+    frame_type:                   Int = 247,
+    offset_delta:                 Int,
+    verification_type_info_stack: VerificationTypeInfo
 ) extends StackMapFrame {
 
     override final def attribute_length: Int = 1 + 2 + verification_type_info_stack.attribute_length
@@ -185,9 +185,9 @@ case class SameFrameExtended(frame_type: Int = 251, offset_delta: Int) extends S
 }
 
 case class AppendFrame(
-        frame_type:                    Int,
-        offset_delta:                  Int,
-        verification_type_info_locals: VerificationTypeInfos
+    frame_type:                    Int,
+    offset_delta:                  Int,
+    verification_type_info_locals: VerificationTypeInfos
 ) extends StackMapFrame {
 
     override final def attribute_length: Int = {
@@ -219,10 +219,10 @@ case class AppendFrame(
 }
 
 case class FullFrame(
-        frame_type:                    Int,
-        offset_delta:                  Int,
-        verification_type_info_locals: VerificationTypeInfos,
-        verification_type_info_stack:  VerificationTypeInfos
+    frame_type:                    Int,
+    offset_delta:                  Int,
+    verification_type_info_locals: VerificationTypeInfos,
+    verification_type_info_stack:  VerificationTypeInfos
 ) extends StackMapFrame {
 
     override final def attribute_length: Int = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/StackMapTable_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/StackMapTable_attribute.scala
index 4c99d22dd7..b3ebb325dd 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/StackMapTable_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/StackMapTable_attribute.scala
@@ -12,8 +12,8 @@ import scala.xml.Node
  * @author Andre Pacak
  */
 case class StackMapTable_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        stack_map_frames:     StackMapFrames
+    attribute_name_index: Constant_Pool_Index,
+    stack_map_frames:     StackMapFrames
 ) extends Attribute {
 
     override final def attribute_length: Int = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/TypeAnnotation.scala b/OPAL/da/src/main/scala/org/opalj/da/TypeAnnotation.scala
index a3034bffa8..a419a74d5f 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/TypeAnnotation.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/TypeAnnotation.scala
@@ -12,10 +12,10 @@ import scala.xml.Node
  * @author Andre Pacak
  */
 case class TypeAnnotation(
-        target_type:         TypeAnnotationTarget,
-        target_path:         TypeAnnotationPath,
-        type_index:          Constant_Pool_Index,
-        element_value_pairs: ElementValuePairs
+    target_type:         TypeAnnotationTarget,
+    target_path:         TypeAnnotationPath,
+    type_index:          Constant_Pool_Index,
+    element_value_pairs: ElementValuePairs
 ) extends AbstractAnnotation {
 
     final def attribute_length: Int = {
diff --git a/OPAL/da/src/main/scala/org/opalj/da/TypeAnnotationPath.scala b/OPAL/da/src/main/scala/org/opalj/da/TypeAnnotationPath.scala
index b78528f465..1c4e54e8e3 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/TypeAnnotationPath.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/TypeAnnotationPath.scala
@@ -36,7 +36,7 @@ trait TypeAnnotationPathElement {
 }
 
 case class TypeAnnotationPathElements(
-        path: TypeAnnotationPathElementsTable
+    path: TypeAnnotationPathElementsTable
 ) extends TypeAnnotationPath {
 
     override final def attribute_length: Int = 1 + path.length * 2
diff --git a/OPAL/da/src/main/scala/org/opalj/da/TypeAnnotationTarget.scala b/OPAL/da/src/main/scala/org/opalj/da/TypeAnnotationTarget.scala
index 5130bdcff8..2ebeeb1a9c 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/TypeAnnotationTarget.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/TypeAnnotationTarget.scala
@@ -51,7 +51,7 @@ sealed abstract class TATTypeParameter extends TypeAnnotationTarget {
 }
 
 case class TATParameterDeclarationOfClassOrInterface(
-        type_parameter_index: Int
+    type_parameter_index: Int
 ) extends TATTypeParameter {
 
     override final def tag: Int = 0x00
@@ -62,7 +62,7 @@ case class TATParameterDeclarationOfClassOrInterface(
 }
 
 case class TATParameterDeclarationOfMethodOrConstructor(
-        type_parameter_index: Int
+    type_parameter_index: Int
 ) extends TATTypeParameter {
 
     override final def tag: Int = 0x01
@@ -115,8 +115,8 @@ sealed abstract class TATTypeParameterBound extends TypeAnnotationTarget {
 }
 
 case class TATTypeBoundOfParameterDeclarationOfClassOrInterface(
-        type_parameter_index: Int,
-        bound_index:          Int
+    type_parameter_index: Int,
+    bound_index:          Int
 ) extends TATTypeParameterBound {
 
     override final def tag: Int = 0x11
@@ -127,8 +127,8 @@ case class TATTypeBoundOfParameterDeclarationOfClassOrInterface(
 }
 
 case class TATTypeBoundOfParameterDeclarationOfMethodOrConstructor(
-        type_parameter_index: Int,
-        bound_index:          Int
+    type_parameter_index: Int,
+    bound_index:          Int
 ) extends TATTypeParameterBound {
 
     override final def tag: Int = 0x12
@@ -359,8 +359,8 @@ case class TATCastExpression(offset: Int, type_argument_index: Int) extends TATT
 }
 
 case class TATConstructorInvocation(
-        offset:              Int,
-        type_argument_index: Int
+    offset:              Int,
+    type_argument_index: Int
 ) extends TATTypeArgument {
 
     override final def tag: Int = 0x48
@@ -373,8 +373,8 @@ case class TATConstructorInvocation(
 }
 
 case class TATMethodInvocation(
-        offset:              Int,
-        type_argument_index: Int
+    offset:              Int,
+    type_argument_index: Int
 ) extends TATTypeArgument {
 
     override final def tag: Int = 0x49
@@ -386,8 +386,8 @@ case class TATMethodInvocation(
 }
 
 case class TATConstructorInMethodReferenceExpression(
-        offset:              Int,
-        type_argument_index: Int
+    offset:              Int,
+    type_argument_index: Int
 ) extends TATTypeArgument {
 
     override final def tag: Int = 0x4A
@@ -398,8 +398,8 @@ case class TATConstructorInMethodReferenceExpression(
 }
 
 case class TATMethodInMethodReferenceExpression(
-        offset:              Int,
-        type_argument_index: Int
+    offset:              Int,
+    type_argument_index: Int
 ) extends TATTypeArgument {
 
     override final def tag: Int = 0x4B
diff --git a/OPAL/da/src/main/scala/org/opalj/da/TypeInfo.scala b/OPAL/da/src/main/scala/org/opalj/da/TypeInfo.scala
index 6589e94510..a78ce514bc 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/TypeInfo.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/TypeInfo.scala
@@ -79,9 +79,9 @@ case class ObjectTypeInfo(asJava: String) extends FieldTypeInfo {
 }
 
 case class ArrayTypeInfo(
-        elementTypeAsJava:     String,
-        dimensions:            Int,
-        elementTypeIsBaseType: Boolean
+    elementTypeAsJava:     String,
+    dimensions:            Int,
+    elementTypeIsBaseType: Boolean
 ) extends FieldTypeInfo {
 
     assert(dimensions > 0)
diff --git a/OPAL/da/src/main/scala/org/opalj/da/Unknown_attribute.scala b/OPAL/da/src/main/scala/org/opalj/da/Unknown_attribute.scala
index ece05c426a..b8aba001d6 100644
--- a/OPAL/da/src/main/scala/org/opalj/da/Unknown_attribute.scala
+++ b/OPAL/da/src/main/scala/org/opalj/da/Unknown_attribute.scala
@@ -8,8 +8,8 @@ import scala.xml.Node
  * @author Michael Eichberg
  */
 case class Unknown_attribute(
-        attribute_name_index: Constant_Pool_Index,
-        info:                 Array[Byte]
+    attribute_name_index: Constant_Pool_Index,
+    info:                 Array[Byte]
 ) extends Attribute {
 
     override final def attribute_length: Int = info.size
diff --git a/OPAL/de/src/main/scala/org/opalj/de/DependencyCollectingDependencyProcessor.scala b/OPAL/de/src/main/scala/org/opalj/de/DependencyCollectingDependencyProcessor.scala
index 127078c4a1..ca2f31bbbe 100644
--- a/OPAL/de/src/main/scala/org/opalj/de/DependencyCollectingDependencyProcessor.scala
+++ b/OPAL/de/src/main/scala/org/opalj/de/DependencyCollectingDependencyProcessor.scala
@@ -24,7 +24,7 @@ import org.opalj.collection.asScala
  * @author Michael Eichberg
  */
 class DependencyCollectingDependencyProcessor(
-        val virtualSourceElementsCountHint: Option[Int]
+    val virtualSourceElementsCountHint: Option[Int]
 ) extends DependencyProcessor {
 
     private[this] val deps =
diff --git a/OPAL/de/src/main/scala/org/opalj/de/DependencyProcessorDecorator.scala b/OPAL/de/src/main/scala/org/opalj/de/DependencyProcessorDecorator.scala
index 37c7ae3488..5950dea3b3 100644
--- a/OPAL/de/src/main/scala/org/opalj/de/DependencyProcessorDecorator.scala
+++ b/OPAL/de/src/main/scala/org/opalj/de/DependencyProcessorDecorator.scala
@@ -15,7 +15,7 @@ import br._
  * This class is thread-safe if the specified base dependency processor is also thread-safe.
  */
 class DependencyProcessorDecorator(
-        baseDependencyProcessor: DependencyProcessor
+    baseDependencyProcessor: DependencyProcessor
 ) extends DependencyProcessor {
 
     def processDependency(
diff --git a/OPAL/de/src/main/scala/org/opalj/de/DependencyStore.scala b/OPAL/de/src/main/scala/org/opalj/de/DependencyStore.scala
index 18d5b61c72..f617bb7c05 100644
--- a/OPAL/de/src/main/scala/org/opalj/de/DependencyStore.scala
+++ b/OPAL/de/src/main/scala/org/opalj/de/DependencyStore.scala
@@ -21,9 +21,9 @@ import scala.collection.parallel.CollectionConverters.IterableIsParallelizable
  * @author Michael Eichberg
  */
 class DependencyStore(
-        val dependencies:             Map[VirtualSourceElement, Map[VirtualSourceElement, Set[DependencyType]]],
-        val dependenciesOnArrayTypes: Map[VirtualSourceElement, Map[ArrayType, Set[DependencyType]]],
-        val dependenciesOnBaseTypes:  Map[VirtualSourceElement, Map[BaseType, Set[DependencyType]]]
+    val dependencies:             Map[VirtualSourceElement, Map[VirtualSourceElement, Set[DependencyType]]],
+    val dependenciesOnArrayTypes: Map[VirtualSourceElement, Map[ArrayType, Set[DependencyType]]],
+    val dependenciesOnBaseTypes:  Map[VirtualSourceElement, Map[BaseType, Set[DependencyType]]]
 )
 
 object DependencyStore {
diff --git a/OPAL/ifds/src/main/scala/org/opalj/ifds/IFDSAnalysis.scala b/OPAL/ifds/src/main/scala/org/opalj/ifds/IFDSAnalysis.scala
index ebd9405fa8..05e0d90ef8 100644
--- a/OPAL/ifds/src/main/scala/org/opalj/ifds/IFDSAnalysis.scala
+++ b/OPAL/ifds/src/main/scala/org/opalj/ifds/IFDSAnalysis.scala
@@ -37,10 +37,10 @@ import org.opalj.ifds.Dependees.Getter
  * @author Marc Clement
  */
 class IFDSFact[Fact <: AbstractIFDSFact, S <: Statement[_, _]](
-        val fact:               Fact,
-        val isUnbalancedReturn: Boolean,
-        val callStmt:           Option[S],
-        val callChain:          Option[Seq[Callable]]
+    val fact:               Fact,
+    val isUnbalancedReturn: Boolean,
+    val callStmt:           Option[S],
+    val callChain:          Option[Seq[Callable]]
 ) {
 
     def this(fact: Fact) = {
@@ -112,7 +112,7 @@ object Dependees {
  * Source fact is the fact within the analysis entity.
  */
 case class PathEdges[Fact <: AbstractIFDSFact, S <: Statement[_ <: C, _], C <: AnyRef](
-        subsumes: (Set[Fact], Fact) => Boolean
+    subsumes: (Set[Fact], Fact) => Boolean
 ) {
     /**
      * Left denotes a single relevant predecessor
@@ -194,8 +194,8 @@ case class PathEdges[Fact <: AbstractIFDSFact, S <: Statement[_ <: C, _], C <: A
  * @param subsumes The subsuming function, return whether a new fact is subsume by the existing ones
  */
 protected class IFDSState[Fact <: AbstractIFDSFact, C <: AnyRef, S <: Statement[_ <: C, _], WorklistItem](
-        val source: (C, IFDSFact[Fact, S]),
-        subsumes:   (Set[Fact], Fact) => Boolean
+    val source: (C, IFDSFact[Fact, S]),
+    subsumes:   (Set[Fact], Fact) => Boolean
 ) {
     val dependees: Dependees[WorklistItem] = Dependees()
     val pathEdges: PathEdges[Fact, S, C] = PathEdges(subsumes)
@@ -207,13 +207,13 @@ protected class IFDSState[Fact <: AbstractIFDSFact, C <: AnyRef, S <: Statement[
  * Contains int variables, which count how many times some method was called.
  */
 case class Statistics(
-        var normalFlow:       Int = 0,
-        var callFlow:         Int = 0,
-        var returnFlow:       Int = 0,
-        var callToReturnFlow: Int = 0,
-        // TODO unbalanced return flow
-        var subsumeTries: Int = 0,
-        var subsumptions: Int = 0
+    var normalFlow:       Int = 0,
+    var callFlow:         Int = 0,
+    var returnFlow:       Int = 0,
+    var callToReturnFlow: Int = 0,
+    // TODO unbalanced return flow
+    var subsumeTries: Int = 0,
+    var subsumptions: Int = 0
 )
 
 /**
@@ -227,9 +227,9 @@ case class Statistics(
  * @author Marc Clement
  */
 class IFDSAnalysis[Fact <: AbstractIFDSFact, C <: AnyRef, S <: Statement[_ <: C, _]](
-        val project:     SomeProject,
-        val ifdsProblem: IFDSProblem[Fact, C, S],
-        val propertyKey: IFDSPropertyMetaInformation[S, Fact]
+    val project:     SomeProject,
+    val ifdsProblem: IFDSProblem[Fact, C, S],
+    val propertyKey: IFDSPropertyMetaInformation[S, Fact]
 ) extends FPCFAnalysis {
     private type WorklistItem = (Option[S], IFDSFact[Fact, S], Option[S]) // statement, fact, predecessor
     private type Worklist = mutable.Queue[WorklistItem]
diff --git a/OPAL/si/src/main/scala/org/opalj/fpcf/ContextNotAvailableException.scala b/OPAL/si/src/main/scala/org/opalj/fpcf/ContextNotAvailableException.scala
index 9524114cc7..ce8d74c7b5 100644
--- a/OPAL/si/src/main/scala/org/opalj/fpcf/ContextNotAvailableException.scala
+++ b/OPAL/si/src/main/scala/org/opalj/fpcf/ContextNotAvailableException.scala
@@ -14,6 +14,6 @@ package fpcf
  * @author Michael Eichberg
  */
 case class ContextNotAvailableException(
-        context:         AnyRef,
-        completeContext: Map[Class[_], AnyRef]
+    context:         AnyRef,
+    completeContext: Map[Class[_], AnyRef]
 ) extends RuntimeException(completeContext.keys.mkString(s"unknown context $context; available: ", ", ", ""))
diff --git a/OPAL/si/src/main/scala/org/opalj/fpcf/EOptionP.scala b/OPAL/si/src/main/scala/org/opalj/fpcf/EOptionP.scala
index df3a703ff5..3b7c419930 100644
--- a/OPAL/si/src/main/scala/org/opalj/fpcf/EOptionP.scala
+++ b/OPAL/si/src/main/scala/org/opalj/fpcf/EOptionP.scala
@@ -533,9 +533,9 @@ object InterimE {
  * For a detailed discussion of the semantics of `lb` and `ub` see [[EOptionP.ub]].
  */
 final class InterimELUBP[+E <: Entity, +P <: Property](
-        val e:  E,
-        val lb: P,
-        val ub: P
+    val e:  E,
+    val lb: P,
+    val ub: P
 ) extends InterimEP[E, P] {
 
     assert(lb != null)
@@ -595,8 +595,8 @@ object InterimLUBP {
 }
 
 final class InterimEUBP[+E <: Entity, +P <: Property](
-        val e:  E,
-        val ub: P
+    val e:  E,
+    val ub: P
 ) extends InterimEP[E, P] {
 
     assert(ub != null)
@@ -711,8 +711,8 @@ object InterimUBP {
 }
 
 final class InterimELBP[+E <: Entity, +P <: Property](
-        val e:  E,
-        val lb: P
+    val e:  E,
+    val lb: P
 ) extends InterimEP[E, P] {
 
     assert(lb != null)
@@ -776,8 +776,8 @@ object InterimLBP {
  * @author Michael Eichberg
  */
 final class EPK[+E <: Entity, +P <: Property](
-        val e:  E,
-        val pk: PropertyKey[P]
+    val e:  E,
+    val pk: PropertyKey[P]
 ) extends EOptionP[E, P] {
 
     override def hasLBP: Boolean = false
diff --git a/OPAL/si/src/main/scala/org/opalj/fpcf/EOptionPSet.scala b/OPAL/si/src/main/scala/org/opalj/fpcf/EOptionPSet.scala
index fd1ce1f165..cee5feb37c 100644
--- a/OPAL/si/src/main/scala/org/opalj/fpcf/EOptionPSet.scala
+++ b/OPAL/si/src/main/scala/org/opalj/fpcf/EOptionPSet.scala
@@ -87,8 +87,8 @@ sealed trait EOptionPSet[E <: Entity, P <: Property] extends Iterable[EOptionP[E
 }
 
 private[fpcf] class MultiEOptionPSet[E <: Entity, P <: Property](
-        private var data:                  Map[Int, mutable.Map[Entity, EOptionP[E, P]]] = IntMap.empty,
-        private[fpcf] var epkUpdatesCount: Int                                           = 0
+    private var data:                  Map[Int, mutable.Map[Entity, EOptionP[E, P]]] = IntMap.empty,
+    private[fpcf] var epkUpdatesCount: Int                                           = 0
 ) extends EOptionPSet[E, P] {
 
     override def foreach[U](f: EOptionP[E, P] => U): Unit = {
diff --git a/OPAL/si/src/main/scala/org/opalj/fpcf/PhaseConfiguration.scala b/OPAL/si/src/main/scala/org/opalj/fpcf/PhaseConfiguration.scala
index 1688b383c1..62a0a2d3da 100644
--- a/OPAL/si/src/main/scala/org/opalj/fpcf/PhaseConfiguration.scala
+++ b/OPAL/si/src/main/scala/org/opalj/fpcf/PhaseConfiguration.scala
@@ -3,6 +3,6 @@ package org.opalj
 package fpcf
 
 case class PhaseConfiguration[A](
-        propertyKinds: PropertyKindsConfiguration,
-        scheduled:     List[ComputationSpecification[A]]
+    propertyKinds: PropertyKindsConfiguration,
+    scheduled:     List[ComputationSpecification[A]]
 )
diff --git a/OPAL/si/src/main/scala/org/opalj/fpcf/PropertyComputationResult.scala b/OPAL/si/src/main/scala/org/opalj/fpcf/PropertyComputationResult.scala
index 0c2f21102c..72481a26fa 100644
--- a/OPAL/si/src/main/scala/org/opalj/fpcf/PropertyComputationResult.scala
+++ b/OPAL/si/src/main/scala/org/opalj/fpcf/PropertyComputationResult.scala
@@ -142,9 +142,9 @@ object MultiResult { private[fpcf] final val id = 2 }
  *      before (using one of the `apply` functions of the property store.)
  */
 final class InterimResult[P >: Null <: Property] private (
-        val eps:       InterimEP[Entity, P],
-        val dependees: Set[SomeEOptionP], // IMPROVE: require EOptionPSets?
-        val c:         ProperOnUpdateContinuation
+    val eps:       InterimEP[Entity, P],
+    val dependees: Set[SomeEOptionP], // IMPROVE: require EOptionPSets?
+    val c:         ProperOnUpdateContinuation
 ) extends ProperPropertyComputationResult { result =>
 
     def key: PropertyKey[P] = eps.pk
@@ -275,8 +275,8 @@ object InterimResult {
  *       computation returns `IncrementalResult` objects.
  */
 case class IncrementalResult[E <: Entity](
-        result:           ProperPropertyComputationResult,
-        nextComputations: Iterator[(PropertyComputation[E], E)]
+    result:           ProperPropertyComputationResult,
+    nextComputations: Iterator[(PropertyComputation[E], E)]
 ) extends ProperPropertyComputationResult {
 
     private[fpcf] final def id = IncrementalResult.id
@@ -373,9 +373,9 @@ object Results {
  * @tparam P The type of the property.
  */
 case class PartialResult[E >: Null <: Entity, P >: Null <: Property](
-        e:  E,
-        pk: PropertyKey[P],
-        u:  UpdateComputation[E, P]
+    e:  E,
+    pk: PropertyKey[P],
+    u:  UpdateComputation[E, P]
 ) extends ProperPropertyComputationResult {
 
     final def epk: EPK[E, P] = EPK(e, pk)
@@ -392,9 +392,9 @@ object PartialResult { private[fpcf] final val id = 6 }
  * of all instantiated types will use an `InterimPartialResult` to commit those results.
  */
 case class InterimPartialResult[SE >: Null <: Property](
-        us:        Iterable[SomePartialResult], // can be empty!
-        dependees: Set[SomeEOptionP], // IMPROVE: require EOptionPSets?
-        c:         OnUpdateContinuation
+    us:        Iterable[SomePartialResult], // can be empty!
+    dependees: Set[SomeEOptionP], // IMPROVE: require EOptionPSets?
+    c:         OnUpdateContinuation
 ) extends ProperPropertyComputationResult {
 
     assert(dependees.nonEmpty)
diff --git a/OPAL/si/src/main/scala/org/opalj/fpcf/PropertyKindsConfiguration.scala b/OPAL/si/src/main/scala/org/opalj/fpcf/PropertyKindsConfiguration.scala
index b653b778d7..e0f099aa9d 100644
--- a/OPAL/si/src/main/scala/org/opalj/fpcf/PropertyKindsConfiguration.scala
+++ b/OPAL/si/src/main/scala/org/opalj/fpcf/PropertyKindsConfiguration.scala
@@ -28,10 +28,10 @@ package fpcf
  * @author Michael Eichberg
  */
 case class PropertyKindsConfiguration(
-        propertyKindsComputedInThisPhase:                      Set[PropertyKind],
-        propertyKindsComputedInLaterPhase:                     Set[PropertyKind]                    = Set.empty,
-        suppressInterimUpdates:                                Map[PropertyKind, Set[PropertyKind]] = Map.empty,
-        collaborativelyComputedPropertyKindsFinalizationOrder: List[List[PropertyKind]]             = List.empty
+    propertyKindsComputedInThisPhase:                      Set[PropertyKind],
+    propertyKindsComputedInLaterPhase:                     Set[PropertyKind]                    = Set.empty,
+    suppressInterimUpdates:                                Map[PropertyKind, Set[PropertyKind]] = Map.empty,
+    collaborativelyComputedPropertyKindsFinalizationOrder: List[List[PropertyKind]]             = List.empty
 ) {
 
     override def toString: String = {
diff --git a/OPAL/si/src/main/scala/org/opalj/fpcf/Schedule.scala b/OPAL/si/src/main/scala/org/opalj/fpcf/Schedule.scala
index 8bbc8974b6..c329afc031 100644
--- a/OPAL/si/src/main/scala/org/opalj/fpcf/Schedule.scala
+++ b/OPAL/si/src/main/scala/org/opalj/fpcf/Schedule.scala
@@ -16,8 +16,8 @@ import org.opalj.util.PerformanceEvaluation.time
  * @author Michael Eichberg
  */
 case class Schedule[A](
-        batches:            List[PhaseConfiguration[A]],
-        initializationData: Map[ComputationSpecification[A], Any]
+    batches:            List[PhaseConfiguration[A]],
+    initializationData: Map[ComputationSpecification[A], Any]
 ) extends (
         (
             PropertyStore,
diff --git a/OPAL/si/src/main/scala/org/opalj/fpcf/par/PKECPropertyStore.scala b/OPAL/si/src/main/scala/org/opalj/fpcf/par/PKECPropertyStore.scala
index 26c41bb6ba..6a2932edd4 100644
--- a/OPAL/si/src/main/scala/org/opalj/fpcf/par/PKECPropertyStore.scala
+++ b/OPAL/si/src/main/scala/org/opalj/fpcf/par/PKECPropertyStore.scala
@@ -28,12 +28,12 @@ import org.opalj.log.LogContext
  * @author Dominik Helm
  */
 class PKECPropertyStore(
-        final val ctx:                   Map[Class[_], AnyRef],
-        val taskManager:                 PKECTaskManager,
-        val THREAD_COUNT:                Int,
-        override val MaxEvaluationDepth: Int
+    final val ctx:                   Map[Class[_], AnyRef],
+    val taskManager:                 PKECTaskManager,
+    val THREAD_COUNT:                Int,
+    override val MaxEvaluationDepth: Int
 )(
-        implicit val logContext: LogContext
+    implicit val logContext: LogContext
 ) extends ParallelPropertyStore {
 
     implicit val propertyStore: PKECPropertyStore = this
@@ -708,7 +708,7 @@ class PKECPropertyStore(
     }
 
     class SetTask[E <: Entity, P <: Property](
-            finalEP: FinalEP[E, P]
+        finalEP: FinalEP[E, P]
     ) extends QualifiedTask {
         val priority = 0
 
@@ -718,8 +718,8 @@ class PKECPropertyStore(
     }
 
     class PropertyComputationTask[E <: Entity](
-            e:  E,
-            pc: PropertyComputation[E]
+        e:  E,
+        pc: PropertyComputation[E]
     ) extends QualifiedTask {
         val priority = 0
 
@@ -729,9 +729,9 @@ class PKECPropertyStore(
     }
 
     class LazyComputationTask[E <: Entity](
-            e:    E,
-            pc:   PropertyComputation[E],
-            pkId: Int
+        e:    E,
+        pc:   PropertyComputation[E],
+        pkId: Int
     ) extends QualifiedTask {
         val priority = 0
 
@@ -745,9 +745,9 @@ class PKECPropertyStore(
     }
 
     class ContinuationTask(
-            depender:    EPKState,
-            oldDependee: SomeEOptionP,
-            dependee:    EPKState
+        depender:    EPKState,
+        oldDependee: SomeEOptionP,
+        dependee:    EPKState
     ) extends QualifiedTask {
         scheduledOnUpdateComputations.incrementAndGet()
 
@@ -764,12 +764,12 @@ class PKECPropertyStore(
 }
 
 case class EPKState(
-        var eOptP:     SomeEOptionP,
-        var c:         OnUpdateContinuation,
-        var dependees: Set[SomeEOptionP],
-        // Use Java's HashSet here, this is internal implementiton only and they are *way* faster
-        dependers:           java.util.HashSet[EPKState] = new java.util.HashSet(),
-        suppressedDependers: java.util.HashSet[EPKState] = new java.util.HashSet()
+    var eOptP:     SomeEOptionP,
+    var c:         OnUpdateContinuation,
+    var dependees: Set[SomeEOptionP],
+    // Use Java's HashSet here, this is internal implementiton only and they are *way* faster
+    dependers:           java.util.HashSet[EPKState] = new java.util.HashSet(),
+    suppressedDependers: java.util.HashSet[EPKState] = new java.util.HashSet()
 ) {
 
     override lazy val hashCode: Int = eOptP.hashCode()
diff --git a/OPAL/si/src/main/scala/org/opalj/fpcf/par/PropertyStoreTracer.scala b/OPAL/si/src/main/scala/org/opalj/fpcf/par/PropertyStoreTracer.scala
index 62e6cd7340..fff3cc0914 100644
--- a/OPAL/si/src/main/scala/org/opalj/fpcf/par/PropertyStoreTracer.scala
+++ b/OPAL/si/src/main/scala/org/opalj/fpcf/par/PropertyStoreTracer.scala
@@ -114,10 +114,10 @@ case class DeferredProcessingResultEvent(eventId: Int, r: PropertyComputationRes
 }
 
 case class FirstExceptionEvent(
-        eventId:    Int,
-        t:          Throwable,
-        thread:     String,
-        stackTrace: String
+    eventId:    Int,
+    t:          Throwable,
+    thread:     String,
+    stackTrace: String
 ) extends StoreEvent {
 
     override def toTxt: String = {
@@ -139,24 +139,24 @@ case class SubphaseFinalizationEvent(eventId: Int, properties: String) extends S
 }
 
 case class FinalizedPropertyEvent(
-        eventId: Int,
-        oldEP:   SomeEOptionP,
-        finalEP: SomeFinalEP
+    eventId: Int,
+    oldEP:   SomeEOptionP,
+    finalEP: SomeFinalEP
 ) extends StoreEvent {
     override def toTxt: String = s"$eventId: FinalizedProperty($oldEP => $finalEP)"
 }
 
 case class AppliedUpdateComputationEvent(
-        eventId:     Int,
-        newEPKState: EPKState,
-        result:      Option[(SomeEOptionP, SomeInterimEP, Iterable[SomeEPK])]
+    eventId:     Int,
+    newEPKState: EPKState,
+    result:      Option[(SomeEOptionP, SomeInterimEP, Iterable[SomeEPK])]
 ) extends StoreEvent {
     override def toTxt: String = s"$eventId: AppliedUpdateComputation($newEPKState; result: $result)"
 }
 
 case class IdempotentUpdateEvent(
-        eventId:     Int,
-        newEPKState: EPKState
+    eventId:     Int,
+    newEPKState: EPKState
 ) extends StoreEvent {
     override def toTxt: String = s"$eventId: IdempotentUpdate($newEPKState)"
 }
@@ -182,10 +182,10 @@ case class ForcingEPKEvaluationEvent(eventId: Int, epk: SomeEPK) extends StoreEv
 }
 
 case class TriggeredComputationEvent(
-        eventId: Int,
-        e:       Entity,
-        pkId:    UShort,
-        c:       SomePropertyComputation
+    eventId: Int,
+    e:       Entity,
+    pkId:    UShort,
+    c:       SomePropertyComputation
 ) extends StoreEvent {
     override def toTxt: String = {
         s"$eventId: TriggeredComputation(${anyRefToShortString(e)},${PropertyKey.name(pkId)},${anyRefToShortString(c)})"
@@ -193,9 +193,9 @@ case class TriggeredComputationEvent(
 }
 
 case class ComputedFallbackEvent(
-        eventId: Int,
-        ep:      SomeFinalEP,
-        why:     String
+    eventId: Int,
+    ep:      SomeFinalEP,
+    why:     String
 ) extends StoreEvent {
     override def toTxt: String = {
         s"$eventId: ComputedFallback($ep,$why)"
@@ -203,9 +203,9 @@ case class ComputedFallbackEvent(
 }
 
 case class ScheduledLazyComputationEvent(
-        eventId: Int,
-        epk:     SomeEPK,
-        c:       SomePropertyComputation
+    eventId: Int,
+    epk:     SomeEPK,
+    c:       SomePropertyComputation
 ) extends StoreEvent {
     override def toTxt: String = {
         s"$eventId: ScheduledLazyComputation($epk,c=${anyRefToShortString(c)})"
@@ -213,10 +213,10 @@ case class ScheduledLazyComputationEvent(
 }
 
 case class ImmediatelyExecutedLazyComputationEvent(
-        eventId:         Int,
-        newEOptionP:     SomeEOptionP,
-        evaluationDepth: Int,
-        c:               SomePropertyComputation
+    eventId:         Int,
+    newEOptionP:     SomeEOptionP,
+    evaluationDepth: Int,
+    c:               SomePropertyComputation
 ) extends StoreEvent {
     override def toTxt: String = {
         s"$eventId: ImmediatelyExecutedLazyComputation" +
@@ -225,9 +225,9 @@ case class ImmediatelyExecutedLazyComputationEvent(
 }
 
 case class EvaluatedTransformerEvent(
-        eventId: Int,
-        source:  SomeEOptionP,
-        target:  SomeFinalEP
+    eventId: Int,
+    source:  SomeEOptionP,
+    target:  SomeFinalEP
 ) extends StoreEvent {
     override def toTxt: String = {
         s"$eventId: EvaluatedTransformer($source => $target)"
@@ -235,9 +235,9 @@ case class EvaluatedTransformerEvent(
 }
 
 case class RegisteredTransformerEvent(
-        eventId: Int,
-        source:  EPKState,
-        target:  EPKState
+    eventId: Int,
+    source:  EPKState,
+    target:  EPKState
 ) extends StoreEvent {
     override def toTxt: String = {
         s"$eventId: RegisteredTransformer($source => $target)"
@@ -245,9 +245,9 @@ case class RegisteredTransformerEvent(
 }
 
 case class HandlingInterimEPKsDueToSuppressionEvent(
-        eventId:     Int,
-        interimEPKs: String,
-        cSCCs:       String
+    eventId:     Int,
+    interimEPKs: String,
+    cSCCs:       String
 ) extends StoreEvent {
     override def toTxt: String = {
         val mEPKs = interimEPKs.replace("\t", "\t\t")
@@ -257,8 +257,8 @@ case class HandlingInterimEPKsDueToSuppressionEvent(
 }
 
 case class MakingIntermediateEPKStateFinalEvent(
-        eventId:         Int,
-        interimEPKState: EPKState
+    eventId:         Int,
+    interimEPKState: EPKState
 ) extends StoreEvent {
     override def toTxt: String = {
         s"$eventId: MakingIntermediateEPKStateFinal($interimEPKState)"
@@ -266,11 +266,11 @@ case class MakingIntermediateEPKStateFinalEvent(
 }
 
 case class ScheduledOnUpdateComputationEvent(
-        eventId:     Int,
-        dependerEPK: SomeEPK,
-        oldEOptionP: SomeEOptionP,
-        newEOptionP: SomeEOptionP,
-        c:           OnUpdateContinuation
+    eventId:     Int,
+    dependerEPK: SomeEPK,
+    oldEOptionP: SomeEOptionP,
+    newEOptionP: SomeEOptionP,
+    c:           OnUpdateContinuation
 ) extends StoreEvent {
     override def toTxt: String = {
         s"$eventId: ScheduledOnUpdateComputation($dependerEPK, $oldEOptionP => $newEOptionP,${anyRefToShortString(c)})"
@@ -278,11 +278,11 @@ case class ScheduledOnUpdateComputationEvent(
 }
 
 case class ImmediatelyRescheduledOnUpdateComputationEvent(
-        eventId:     Int,
-        dependerEPK: SomeEPK,
-        oldEOptionP: SomeEOptionP,
-        newEOptionP: SomeEOptionP,
-        c:           OnUpdateContinuation
+    eventId:     Int,
+    dependerEPK: SomeEPK,
+    oldEOptionP: SomeEOptionP,
+    newEOptionP: SomeEOptionP,
+    c:           OnUpdateContinuation
 ) extends StoreEvent {
     override def toTxt: String = {
         s"$eventId: ImmediatelyRescheduledOnUpdateComputation($dependerEPK, $oldEOptionP => $newEOptionP,${anyRefToShortString(c)})"
@@ -290,11 +290,11 @@ case class ImmediatelyRescheduledOnUpdateComputationEvent(
 }
 
 case class ScheduledOnUpdateComputationForFinalEPEvent(
-        eventId:     Int,
-        dependerEPK: SomeEPK,
-        oldEOptionP: SomeEOptionP,
-        finalEP:     SomeFinalEP,
-        c:           OnUpdateContinuation
+    eventId:     Int,
+    dependerEPK: SomeEPK,
+    oldEOptionP: SomeEOptionP,
+    finalEP:     SomeFinalEP,
+    c:           OnUpdateContinuation
 ) extends StoreEvent {
     override def toTxt: String = {
         s"$eventId: ScheduledOnUpdateComputationForFinalEP($dependerEPK, $oldEOptionP => $finalEP,${anyRefToShortString(c)})"
diff --git a/OPAL/si/src/main/scala/org/opalj/fpcf/seq/PKESequentialPropertyStore.scala b/OPAL/si/src/main/scala/org/opalj/fpcf/seq/PKESequentialPropertyStore.scala
index e5a7ae23b1..1ffcc3ccb9 100644
--- a/OPAL/si/src/main/scala/org/opalj/fpcf/seq/PKESequentialPropertyStore.scala
+++ b/OPAL/si/src/main/scala/org/opalj/fpcf/seq/PKESequentialPropertyStore.scala
@@ -24,11 +24,11 @@ import org.opalj.log.OPALLogger.info
  * @author Michael Eichberg
  */
 final class PKESequentialPropertyStore protected (
-        val ctx:                Map[Class[_], AnyRef],
-        val tasksManager:       TasksManager,
-        val MaxEvaluationDepth: Int
+    val ctx:                Map[Class[_], AnyRef],
+    val tasksManager:       TasksManager,
+    val MaxEvaluationDepth: Int
 )(
-        implicit val logContext: LogContext
+    implicit val logContext: LogContext
 ) extends SeqPropertyStore { store =>
 
     info("property store", s"using $tasksManager for managing tasks")
diff --git a/OPAL/si/src/main/scala/org/opalj/fpcf/seq/QualifiedTask.scala b/OPAL/si/src/main/scala/org/opalj/fpcf/seq/QualifiedTask.scala
index 3b51e4ec26..3d4c28a07f 100644
--- a/OPAL/si/src/main/scala/org/opalj/fpcf/seq/QualifiedTask.scala
+++ b/OPAL/si/src/main/scala/org/opalj/fpcf/seq/QualifiedTask.scala
@@ -19,8 +19,8 @@ sealed abstract class QualifiedTask extends (() => Unit) {
 }
 
 final case class HandleResultTask[E <: Entity, P <: Property](
-        ps: PropertyStore,
-        r:  PropertyComputationResult
+    ps: PropertyStore,
+    r:  PropertyComputationResult
 ) extends QualifiedTask {
 
     override def apply(): Unit = {
@@ -37,9 +37,9 @@ final case class HandleResultTask[E <: Entity, P <: Property](
 }
 
 final case class PropertyComputationTask[E <: Entity](
-        ps: PropertyStore,
-        e:  E,
-        pc: PropertyComputation[E]
+    ps: PropertyStore,
+    e:  E,
+    pc: PropertyComputation[E]
 ) extends QualifiedTask {
 
     override def apply(): Unit = ps.handleResult(pc(e))
@@ -48,9 +48,9 @@ final case class PropertyComputationTask[E <: Entity](
 }
 
 final case class OnFinalUpdateComputationTask[E <: Entity, P <: Property](
-        ps: PropertyStore,
-        r:  FinalEP[E, P],
-        c:  OnUpdateContinuation
+    ps: PropertyStore,
+    r:  FinalEP[E, P],
+    c:  OnUpdateContinuation
 ) extends QualifiedTask {
 
     override def apply(): Unit = {
@@ -61,9 +61,9 @@ final case class OnFinalUpdateComputationTask[E <: Entity, P <: Property](
 }
 
 final case class OnUpdateComputationTask[E <: Entity, P <: Property](
-        ps:  PropertyStore,
-        epk: EPK[E, P],
-        c:   OnUpdateContinuation
+    ps:  PropertyStore,
+    epk: EPK[E, P],
+    c:   OnUpdateContinuation
 ) extends QualifiedTask {
 
     override def apply(): Unit = {
diff --git a/OPAL/si/src/main/scala/org/opalj/fpcf/seq/TasksManager.scala b/OPAL/si/src/main/scala/org/opalj/fpcf/seq/TasksManager.scala
index b68cd9c1e5..9b0625150a 100644
--- a/OPAL/si/src/main/scala/org/opalj/fpcf/seq/TasksManager.scala
+++ b/OPAL/si/src/main/scala/org/opalj/fpcf/seq/TasksManager.scala
@@ -116,23 +116,23 @@ private[seq] final class FIFOTasksManager extends TasksManager {
 }
 
 private class WeightedQualifiedTask(
-        val task:   QualifiedTask,
-        val weight: Int
+    val task:   QualifiedTask,
+    val weight: Int
 ) extends Comparable[WeightedQualifiedTask] {
     def compareTo(other: WeightedQualifiedTask) = this.weight - other.weight
 }
 
 private class WeightedExtendedQualifiedTask(
-        val task:    QualifiedTask,
-        val taskEPK: SomeEPK,
-        val weight:  Int
+    val task:    QualifiedTask,
+    val taskEPK: SomeEPK,
+    val weight:  Int
 ) extends Comparable[WeightedQualifiedTask] {
     def compareTo(other: WeightedQualifiedTask) = this.weight - other.weight
 }
 
 private class ExtendedQualifiedTask(
-        val task:    QualifiedTask,
-        val taskEPK: SomeEPK
+    val task:    QualifiedTask,
+    val taskEPK: SomeEPK
 )
 
 trait PropertyStoreDependentTasksManager extends TasksManager {
@@ -480,8 +480,8 @@ private[seq] final class ManyDependeesAndDependersOfDirectDependersFirstTasksMan
 }
 
 private[seq] final class AllDependeesTasksManager(
-        final val forward:           Boolean = true,
-        final val manyDependeesLast: Boolean = true
+    final val forward:           Boolean = true,
+    final val manyDependeesLast: Boolean = true
 ) extends PropertyStoreDependentTasksManager {
 
     private[this] val initialTasks: ArrayDeque[QualifiedTask] = new ArrayDeque(50000)
diff --git a/OPAL/si/src/test/scala/org/opalj/fpcf/PropertyComputationsSchedulerTest.scala b/OPAL/si/src/test/scala/org/opalj/fpcf/PropertyComputationsSchedulerTest.scala
index 784529bab3..e78f9e5aae 100644
--- a/OPAL/si/src/test/scala/org/opalj/fpcf/PropertyComputationsSchedulerTest.scala
+++ b/OPAL/si/src/test/scala/org/opalj/fpcf/PropertyComputationsSchedulerTest.scala
@@ -22,12 +22,12 @@ class PropertyComputationsSchedulerTest extends AnyFunSpec with Matchers with Be
     implicit val logContext: GlobalLogContext.type = GlobalLogContext
 
     case class BasicComputationSpecification(
-            override val name:      String,
-            computationType:        ComputationType,
-            uses:                   Set[PropertyBounds]    = Set.empty,
-            derivesLazily:          Option[PropertyBounds] = None,
-            derivesEagerly:         Set[PropertyBounds]    = Set.empty,
-            derivesCollaboratively: Set[PropertyBounds]    = Set.empty
+        override val name:      String,
+        computationType:        ComputationType,
+        uses:                   Set[PropertyBounds]    = Set.empty,
+        derivesLazily:          Option[PropertyBounds] = None,
+        derivesEagerly:         Set[PropertyBounds]    = Set.empty,
+        derivesCollaboratively: Set[PropertyBounds]    = Set.empty
     ) extends SimpleComputationSpecification[Unit] {
         override def schedule(ps: PropertyStore, unused: Null): Unit = {}
 
diff --git a/OPAL/si/src/test/scala/org/opalj/fpcf/PropertyStoreTest.scala b/OPAL/si/src/test/scala/org/opalj/fpcf/PropertyStoreTest.scala
index bd1b122124..b4e3b7d2c5 100644
--- a/OPAL/si/src/test/scala/org/opalj/fpcf/PropertyStoreTest.scala
+++ b/OPAL/si/src/test/scala/org/opalj/fpcf/PropertyStoreTest.scala
@@ -958,7 +958,7 @@ sealed abstract class PropertyStoreTest[PS <: PropertyStore]
             }
 
             class ReachableNodesCountAnalysis(
-                    val ps: PropertyStore
+                val ps: PropertyStore
             ) extends (Node => ProperPropertyComputationResult) {
 
                 def apply(n: Node): ProperPropertyComputationResult = {
@@ -1039,7 +1039,7 @@ sealed abstract class PropertyStoreTest[PS <: PropertyStore]
             }
 
             class ReachableNodesCountViaReachableNodesAnalysis(
-                    val ps: PropertyStore
+                val ps: PropertyStore
             ) extends (Node => ProperPropertyComputationResult) {
                 def apply(n: Node): ProperPropertyComputationResult = {
 
diff --git a/OPAL/si/src/test/scala/org/opalj/fpcf/fixtures/Node.scala b/OPAL/si/src/test/scala/org/opalj/fpcf/fixtures/Node.scala
index 388a9acdd2..9523f3e2d1 100644
--- a/OPAL/si/src/test/scala/org/opalj/fpcf/fixtures/Node.scala
+++ b/OPAL/si/src/test/scala/org/opalj/fpcf/fixtures/Node.scala
@@ -11,8 +11,8 @@ import scala.collection.mutable
  * @note Only intended to be used as a test fixture.
  */
 final class Node(
-        val name:    String,
-        val targets: mutable.Set[Node] = mutable.Set.empty
+    val name:    String,
+    val targets: mutable.Set[Node] = mutable.Set.empty
 ) {
 
     override def hashCode: Int = name.hashCode()
diff --git a/OPAL/si/src/test/scala/org/opalj/fpcf/fixtures/PropertyStoreConfigurationRecorder.scala b/OPAL/si/src/test/scala/org/opalj/fpcf/fixtures/PropertyStoreConfigurationRecorder.scala
index 1ae9432dea..d046dae037 100644
--- a/OPAL/si/src/test/scala/org/opalj/fpcf/fixtures/PropertyStoreConfigurationRecorder.scala
+++ b/OPAL/si/src/test/scala/org/opalj/fpcf/fixtures/PropertyStoreConfigurationRecorder.scala
@@ -103,7 +103,7 @@ class BasePropertyStoreMockup extends PropertyStore {
 
 /** A simple property store which will return the values when queried consecutively */
 class InitializedPropertyStore(
-        val data: IntMap[Map[Entity, mutable.Queue[EOptionP[Entity, Property]]]]
+    val data: IntMap[Map[Entity, mutable.Queue[EOptionP[Entity, Property]]]]
 ) extends BasePropertyStoreMockup {
 
     override def doApply[E <: Entity, P <: Property](
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/DUVar.scala b/OPAL/tac/src/main/scala/org/opalj/tac/DUVar.scala
index e7c6b929df..81b2111708 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/DUVar.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/DUVar.scala
@@ -110,9 +110,9 @@ object DefSites {
  * @param value The value information.
  */
 class DVar[+Value <: ValueInformation /*org.opalj.ai.ValuesDomain#DomainValue*/ ] private (
-        private[tac] var origin:   ValueOrigin,
-        val value:                 Value,
-        private[tac] var useSites: IntTrieSet
+    private[tac] var origin:   ValueOrigin,
+    val value:                 Value,
+    private[tac] var useSites: IntTrieSet
 ) extends DUVar[Value] {
 
     assert(origin >= 0)
@@ -214,8 +214,8 @@ object DVar {
 }
 
 class UVar[+Value <: ValueInformation /*org.opalj.ai.ValuesDomain#DomainValue*/ ] private (
-        val value:                 Value,
-        private[tac] var defSites: IntTrieSet
+    val value:                 Value,
+    private[tac] var defSites: IntTrieSet
 ) extends DUVar[Value] {
 
     def name: String = {
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/Expr.scala b/OPAL/tac/src/main/scala/org/opalj/tac/Expr.scala
index 04d5f233c8..e124014994 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/Expr.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/Expr.scala
@@ -177,10 +177,10 @@ object InstanceOf { final val ASTID = -2 }
  * A comparison of two values.
  */
 case class Compare[+V <: Var[V]](
-        pc:        PC,
-        left:      Expr[V],
-        condition: RelationalOperator,
-        right:     Expr[V]
+    pc:        PC,
+    left:      Expr[V],
+    condition: RelationalOperator,
+    right:     Expr[V]
 ) extends Expr[V] {
     override final def isCompare: Boolean = true
     override final def asCompare: this.type = this
@@ -342,10 +342,10 @@ case class ClassConst(pc: PC, value: ReferenceType) extends SimpleValueConst {
 object ClassConst { final val ASTID = -12 }
 
 case class DynamicConst(
-        pc:              PC,
-        bootstrapMethod: BootstrapMethod,
-        name:            String,
-        descriptor:      FieldType
+    pc:              PC,
+    bootstrapMethod: BootstrapMethod,
+    name:            String,
+    descriptor:      FieldType
 ) extends SimpleValueConst {
     override final def isDynamicConst: Boolean = true
     override final def asDynamicConst: this.type = this
@@ -371,11 +371,11 @@ object NullExpr { final val ASTID = -13 }
  *              succeeds.
  */
 case class BinaryExpr[+V <: Var[V]](
-        pc:    PC,
-        cTpe:  ComputationalType,
-        op:    BinaryArithmeticOperator,
-        left:  Expr[V],
-        right: Expr[V]
+    pc:    PC,
+    cTpe:  ComputationalType,
+    op:    BinaryArithmeticOperator,
+    left:  Expr[V],
+    right: Expr[V]
 ) extends Expr[V] {
 
     override final def isValueExpression: Boolean = false
@@ -419,10 +419,10 @@ object BinaryExpr { final val ASTID = -14 }
  * @param cTpe The computational type of the result of the prefix expression.
  */
 case class PrefixExpr[+V <: Var[V]](
-        pc:      PC,
-        cTpe:    ComputationalType,
-        op:      UnaryArithmeticOperator,
-        operand: Expr[V]
+    pc:      PC,
+    cTpe:    ComputationalType,
+    op:      UnaryArithmeticOperator,
+    operand: Expr[V]
 ) extends Expr[V] {
 
     override final def isValueExpression: Boolean = false
@@ -454,9 +454,9 @@ case class PrefixExpr[+V <: Var[V]](
 object PrefixExpr { final val ASTID = -15 }
 
 case class PrimitiveTypecastExpr[+V <: Var[V]](
-        pc:        PC,
-        targetTpe: BaseType,
-        operand:   Expr[V]
+    pc:        PC,
+    targetTpe: BaseType,
+    operand:   Expr[V]
 ) extends Expr[V] {
 
     override final def isValueExpression: Boolean = false
@@ -657,11 +657,11 @@ abstract class FieldRead[+V <: Var[V]] extends Expr[V] {
 }
 
 case class GetField[+V <: Var[V]](
-        pc:                PC,
-        declaringClass:    ObjectType,
-        name:              String,
-        declaredFieldType: FieldType,
-        objRef:            Expr[V]
+    pc:                PC,
+    declaringClass:    ObjectType,
+    name:              String,
+    declaredFieldType: FieldType,
+    objRef:            Expr[V]
 ) extends FieldRead[V] {
 
     override final def isGetField: Boolean = true
@@ -706,10 +706,10 @@ case class GetField[+V <: Var[V]](
 object GetField { final val ASTID = -21 }
 
 case class GetStatic(
-        pc:                PC,
-        declaringClass:    ObjectType,
-        name:              String,
-        declaredFieldType: FieldType
+    pc:                PC,
+    declaringClass:    ObjectType,
+    name:              String,
+    declaredFieldType: FieldType
 ) extends FieldRead[Nothing] {
 
     override final def isGetStatic: Boolean = true
@@ -749,11 +749,11 @@ object GetStatic { final val ASTID = -22 }
  * @tparam V The type of the [[Var]]s.
  */
 case class InvokedynamicFunctionCall[+V <: Var[V]](
-        pc:              PC,
-        bootstrapMethod: BootstrapMethod,
-        name:            String,
-        descriptor:      MethodDescriptor,
-        params:          Seq[Expr[V]]
+    pc:              PC,
+    bootstrapMethod: BootstrapMethod,
+    name:            String,
+    descriptor:      MethodDescriptor,
+    params:          Seq[Expr[V]]
 ) extends Expr[V] {
 
     override final def asInvokedynamicFunctionCall: this.type = this
@@ -844,13 +844,13 @@ sealed abstract class InstanceFunctionCall[+V <: Var[V]] extends FunctionCall[V]
  * @tparam V The type of the Var used by this representation.
  */
 case class NonVirtualFunctionCall[+V <: Var[V]](
-        pc:             PC,
-        declaringClass: ObjectType,
-        isInterface:    Boolean,
-        name:           String,
-        descriptor:     MethodDescriptor,
-        receiver:       Expr[V],
-        params:         Seq[Expr[V]]
+    pc:             PC,
+    declaringClass: ObjectType,
+    isInterface:    Boolean,
+    name:           String,
+    descriptor:     MethodDescriptor,
+    receiver:       Expr[V],
+    params:         Seq[Expr[V]]
 ) extends InstanceFunctionCall[V] {
 
     override final def asNonVirtualFunctionCall: this.type = this
@@ -916,13 +916,13 @@ case class NonVirtualFunctionCall[+V <: Var[V]](
 object NonVirtualFunctionCall { final val ASTID = -24 }
 
 case class VirtualFunctionCall[+V <: Var[V]](
-        pc:             PC,
-        declaringClass: ReferenceType,
-        isInterface:    Boolean,
-        name:           String,
-        descriptor:     MethodDescriptor,
-        receiver:       Expr[V],
-        params:         Seq[Expr[V]]
+    pc:             PC,
+    declaringClass: ReferenceType,
+    isInterface:    Boolean,
+    name:           String,
+    descriptor:     MethodDescriptor,
+    receiver:       Expr[V],
+    params:         Seq[Expr[V]]
 ) extends InstanceFunctionCall[V]
     with VirtualCall[V] {
 
@@ -971,12 +971,12 @@ case class VirtualFunctionCall[+V <: Var[V]](
 object VirtualFunctionCall { final val ASTID = -25 }
 
 case class StaticFunctionCall[+V <: Var[V]](
-        pc:             PC,
-        declaringClass: ObjectType,
-        isInterface:    Boolean,
-        name:           String,
-        descriptor:     MethodDescriptor,
-        params:         Seq[Expr[V]]
+    pc:             PC,
+    declaringClass: ObjectType,
+    isInterface:    Boolean,
+    name:           String,
+    descriptor:     MethodDescriptor,
+    params:         Seq[Expr[V]]
 ) extends FunctionCall[V] {
 
     override final def allParams: Seq[Expr[V]] = params
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/Parameters.scala b/OPAL/tac/src/main/scala/org/opalj/tac/Parameters.scala
index d56a9fc3e9..cff16bf683 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/Parameters.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/Parameters.scala
@@ -16,7 +16,7 @@ import org.opalj.ai.ValueOrigin
  * @author Michael Eichberg
  */
 class Parameters[P <: AnyRef](
-        val parameters: Array[P] // EVENTUALLY CONST
+    val parameters: Array[P] // EVENTUALLY CONST
 ) extends (Int => P) {
 
     /**
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/Stmt.scala b/OPAL/tac/src/main/scala/org/opalj/tac/Stmt.scala
index 4eb98efb8c..4310446df5 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/Stmt.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/Stmt.scala
@@ -111,11 +111,11 @@ sealed abstract class Stmt[+V <: Var[V]] extends ASTNode[V] {
  *        generating source code.
  */
 case class If[+V <: Var[V]](
-        pc:                      PC,
-        left:                    Expr[V],
-        condition:               RelationalOperator,
-        right:                   Expr[V],
-        private[tac] var target: Int
+    pc:                      PC,
+    left:                    Expr[V],
+    condition:               RelationalOperator,
+    right:                   Expr[V],
+    private[tac] var target: Int
 ) extends Stmt[V] {
 
     override final def asIf: this.type = this
@@ -292,10 +292,10 @@ object JSR {
  *        were determined to be dead.
  */
 case class Switch[+V <: Var[V]](
-        pc:                        PC,
-        private var defaultTarget: Int,
-        index:                     Expr[V],
-        private var npairs:        ArraySeq[IntIntPair /*(Case Value, Jump Target)*/ ]
+    pc:                        PC,
+    private var defaultTarget: Int,
+    index:                     Expr[V],
+    private var npairs:        ArraySeq[IntIntPair /*(Case Value, Jump Target)*/ ]
 ) extends Stmt[V] {
 
     override final def asSwitch: this.type = this
@@ -363,9 +363,9 @@ object AssignmentLikeStmt {
 }
 
 case class Assignment[+V <: Var[V]](
-        pc:        PC,
-        targetVar: V,
-        expr:      Expr[V]
+    pc:        PC,
+    targetVar: V,
+    expr:      Expr[V]
 ) extends AssignmentLikeStmt[V] {
 
     override final def asAssignment: this.type = this
@@ -577,10 +577,10 @@ object MonitorExit {
 }
 
 case class ArrayStore[+V <: Var[V]](
-        pc:       PC,
-        arrayRef: Expr[V],
-        index:    Expr[V],
-        value:    Expr[V]
+    pc:       PC,
+    arrayRef: Expr[V],
+    index:    Expr[V],
+    value:    Expr[V]
 ) extends Stmt[V] {
 
     override final def asArrayStore: this.type = this
@@ -667,11 +667,11 @@ sealed abstract class FieldWriteAccessStmt[+V <: Var[V]] extends Stmt[V] {
 }
 
 case class PutStatic[+V <: Var[V]](
-        pc:                PC,
-        declaringClass:    ObjectType,
-        name:              String,
-        declaredFieldType: FieldType,
-        value:             Expr[V]
+    pc:                PC,
+    declaringClass:    ObjectType,
+    name:              String,
+    declaredFieldType: FieldType,
+    value:             Expr[V]
 ) extends FieldWriteAccessStmt[V] {
 
     override final def asPutStatic: this.type = this
@@ -713,12 +713,12 @@ object PutStatic {
 }
 
 case class PutField[+V <: Var[V]](
-        pc:                Int,
-        declaringClass:    ObjectType,
-        name:              String,
-        declaredFieldType: FieldType,
-        objRef:            Expr[V],
-        value:             Expr[V]
+    pc:                Int,
+    declaringClass:    ObjectType,
+    name:              String,
+    declaredFieldType: FieldType,
+    objRef:            Expr[V],
+    value:             Expr[V]
 ) extends FieldWriteAccessStmt[V] {
 
     override final def asPutField: this.type = this
@@ -807,13 +807,13 @@ object InstanceMethodCall {
  * I.e., it is either a super-call, a private instance method call or a constructor call.
  */
 case class NonVirtualMethodCall[+V <: Var[V]](
-        pc:             Int,
-        declaringClass: ObjectType,
-        isInterface:    Boolean,
-        name:           String,
-        descriptor:     MethodDescriptor,
-        receiver:       Expr[V],
-        params:         Seq[Expr[V]]
+    pc:             Int,
+    declaringClass: ObjectType,
+    isInterface:    Boolean,
+    name:           String,
+    descriptor:     MethodDescriptor,
+    receiver:       Expr[V],
+    params:         Seq[Expr[V]]
 ) extends InstanceMethodCall[V] {
 
     override final def asNonVirtualMethodCall: this.type = this
@@ -867,13 +867,13 @@ object NonVirtualMethodCall {
 }
 
 case class VirtualMethodCall[+V <: Var[V]](
-        pc:             Int,
-        declaringClass: ReferenceType,
-        isInterface:    Boolean,
-        name:           String,
-        descriptor:     MethodDescriptor,
-        receiver:       Expr[V],
-        params:         Seq[Expr[V]]
+    pc:             Int,
+    declaringClass: ReferenceType,
+    isInterface:    Boolean,
+    name:           String,
+    descriptor:     MethodDescriptor,
+    receiver:       Expr[V],
+    params:         Seq[Expr[V]]
 ) extends InstanceMethodCall[V] with VirtualCall[V] {
 
     override final def asVirtualMethodCall: this.type = this
@@ -907,12 +907,12 @@ object VirtualMethodCall {
 }
 
 case class StaticMethodCall[+V <: Var[V]](
-        pc:             Int,
-        declaringClass: ObjectType,
-        isInterface:    Boolean,
-        name:           String,
-        descriptor:     MethodDescriptor,
-        params:         Seq[Expr[V]]
+    pc:             Int,
+    declaringClass: ObjectType,
+    isInterface:    Boolean,
+    name:           String,
+    descriptor:     MethodDescriptor,
+    params:         Seq[Expr[V]]
 ) extends MethodCall[V] {
 
     override final def allParams: Seq[Expr[V]] = params
@@ -983,11 +983,11 @@ object StaticMethodCall {
  * @tparam V The type of the [[Var]]s.
  */
 case class InvokedynamicMethodCall[+V <: Var[V]](
-        pc:              PC,
-        bootstrapMethod: BootstrapMethod,
-        name:            String,
-        descriptor:      MethodDescriptor,
-        params:          Seq[Expr[V]]
+    pc:              PC,
+    bootstrapMethod: BootstrapMethod,
+    name:            String,
+    descriptor:      MethodDescriptor,
+    params:          Seq[Expr[V]]
 ) extends Stmt[V] {
 
     override final def astID: Int = InvokedynamicMethodCall.ASTID
@@ -1126,9 +1126,9 @@ object StaticFunctionCallStatement {
  * @note `CaughtException` expression are only created by [[TACAI]]!
  */
 case class CaughtException[+V <: Var[V]](
-        pc:                        PC,
-        exceptionType:             Option[ObjectType],
-        private var throwingStmts: IntTrieSet
+    pc:                        PC,
+    exceptionType:             Option[ObjectType],
+    private var throwingStmts: IntTrieSet
 ) extends Stmt[V] {
 
     override final def isCaughtException: Boolean = true
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/TACOptimization.scala b/OPAL/tac/src/main/scala/org/opalj/tac/TACOptimization.scala
index 034788ea55..186b08e542 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/TACOptimization.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/TACOptimization.scala
@@ -22,6 +22,6 @@ trait TACOptimization[P <: AnyRef, V <: Var[V], C <: TACode[P, V]] {
  * @author Michael Eichberg
  */
 case class TACOptimizationResult[P <: AnyRef, V <: Var[V], C <: TACode[P, V]](
-        code:           C,
-        wasTransformed: Boolean
+    code:           C,
+    wasTransformed: Boolean
 )
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/TACStmts.scala b/OPAL/tac/src/main/scala/org/opalj/tac/TACStmts.scala
index 05161a0a95..f7fb6f386b 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/TACStmts.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/TACStmts.scala
@@ -10,7 +10,7 @@ import org.opalj.br.CodeSequence
  * @author Michael Eichberg
  */
 case class TACStmts[V <: Var[V]](
-        instructions: Array[Stmt[V]]
+    instructions: Array[Stmt[V]]
 ) extends CodeSequence[Stmt[V]] {
 
     override final def pcOfPreviousInstruction(pc: Int): Int = {
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/TACode.scala b/OPAL/tac/src/main/scala/org/opalj/tac/TACode.scala
index 2aeb0a9400..0ca6a2fece 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/TACode.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/TACode.scala
@@ -170,11 +170,11 @@ object TACode {
 }
 
 final class AITACode[P <: AnyRef, VI <: ValueInformation](
-        val params:            Parameters[P],
-        val stmts:             Array[Stmt[DUVar[VI]]],
-        val pcToIndex:         Array[Int],
-        val cfg:               CFG[Stmt[DUVar[VI]], TACStmts[DUVar[VI]]],
-        val exceptionHandlers: ExceptionHandlers
+    val params:            Parameters[P],
+    val stmts:             Array[Stmt[DUVar[VI]]],
+    val pcToIndex:         Array[Int],
+    val cfg:               CFG[Stmt[DUVar[VI]], TACStmts[DUVar[VI]]],
+    val exceptionHandlers: ExceptionHandlers
 ) extends TACode[P, DUVar[VI]] {
 
     import AITACode.AITACodeCFG
@@ -214,11 +214,11 @@ object AITACode {
 }
 
 final class NaiveTACode[P <: AnyRef](
-        val params:            Parameters[P],
-        val stmts:             Array[Stmt[IdBasedVar]],
-        val pcToIndex:         Array[Int],
-        val cfg:               CFG[Stmt[IdBasedVar], TACStmts[IdBasedVar]],
-        val exceptionHandlers: ExceptionHandlers
+    val params:            Parameters[P],
+    val stmts:             Array[Stmt[IdBasedVar]],
+    val pcToIndex:         Array[Int],
+    val cfg:               CFG[Stmt[IdBasedVar], TACStmts[IdBasedVar]],
+    val exceptionHandlers: ExceptionHandlers
 ) extends TACode[P, IdBasedVar] {
 
     override def toString: String = toString("NaiveTACode", "")
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/ConfiguredMethodsHelper.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/ConfiguredMethodsHelper.scala
index b7542bd964..719d6e8ed4 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/ConfiguredMethodsHelper.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/ConfiguredMethodsHelper.scala
@@ -33,11 +33,11 @@ object ConfiguredMethods {
 }
 
 case class ConfiguredMethodData(
-        cf:                String,
-        name:              String,
-        desc:              String,
-        pointsTo:          Option[Array[PointsToRelation]],
-        methodInvocations: Option[Array[MethodDescription]]
+    cf:                String,
+    name:              String,
+    desc:              String,
+    pointsTo:          Option[Array[PointsToRelation]],
+    methodInvocations: Option[Array[MethodDescription]]
 ) {
     def method(
         implicit declaredMethods: DeclaredMethods
@@ -156,11 +156,11 @@ case class ParameterDescription(cf: String, name: String, desc: String, index: I
 }
 
 case class AllocationSiteDescription(
-        cf:                  String,
-        name:                String,
-        desc:                String,
-        instantiatedType:    String,
-        arrayComponentTypes: scala.collection.Seq[String]
+    cf:                  String,
+    name:                String,
+    desc:                String,
+    instantiatedType:    String,
+    arrayComponentTypes: scala.collection.Seq[String]
 ) extends EntityDescription {
     def method(declaredMethods: DeclaredMethods): DeclaredMethod = {
         val classType = ObjectType(cf)
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/FieldImmutabilityAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/FieldImmutabilityAnalysis.scala
index 2529f34c3d..db7a66e4db 100755
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/FieldImmutabilityAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/FieldImmutabilityAnalysis.scala
@@ -83,12 +83,12 @@ class FieldImmutabilityAnalysis private[analyses] (val project: SomeProject)
     extends FPCFAnalysis {
 
     case class State(
-            field:                          DeclaredField,
-            var fieldImmutabilityDependees: Set[EOptionP[Entity, Property]] = Set.empty,
-            var genericTypeParameters:      SortedSet[String]               = SortedSet.empty,
-            var innerTypes:                 Set[ReferenceType]              = Set.empty,
-            var lowerBound:                 FieldImmutability               = MutableField,
-            var upperBound:                 FieldImmutability               = TransitivelyImmutableField
+        field:                          DeclaredField,
+        var fieldImmutabilityDependees: Set[EOptionP[Entity, Property]] = Set.empty,
+        var genericTypeParameters:      SortedSet[String]               = SortedSet.empty,
+        var innerTypes:                 Set[ReferenceType]              = Set.empty,
+        var lowerBound:                 FieldImmutability               = MutableField,
+        var upperBound:                 FieldImmutability               = TransitivelyImmutableField
     ) extends BaseAnalysisState with TypeIteratorState {
         def hasFieldImmutabilityDependees: Boolean = fieldImmutabilityDependees.nonEmpty || super.hasOpenDependencies
         def getFieldImmutabilityDependees: Set[EOptionP[Entity, Property]] = fieldImmutabilityDependees
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/FieldLocalityAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/FieldLocalityAnalysis.scala
index fd095b3740..1024342321 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/FieldLocalityAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/FieldLocalityAnalysis.scala
@@ -78,7 +78,7 @@ import org.opalj.value.ValueInformation
  * @author Dominik Helm
  */
 class FieldLocalityAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     type V = DUVar[ValueInformation]
@@ -912,9 +912,9 @@ object DefinitionSitesWithoutPutField {
  * @author Florian Kuebler
  */
 final case class DefinitionSiteWithoutPutField(
-        method:     Method,
-        pc:         Int,
-        putFieldPC: Int
+    method:     Method,
+    pc:         Int,
+    putFieldPC: Int
 ) extends DefinitionSiteLike {
     override def usedBy[V <: ValueInformation](
         tacode: TACode[TACMethodParameter, DUVar[V]]
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/SystemPropertiesAnalysisScheduler.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/SystemPropertiesAnalysisScheduler.scala
index f3c835ecf7..e35ccd3c9e 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/SystemPropertiesAnalysisScheduler.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/SystemPropertiesAnalysisScheduler.scala
@@ -31,7 +31,7 @@ import org.opalj.tac.fpcf.properties.TACAI
 import org.opalj.value.ValueInformation
 
 class SystemPropertiesAnalysisScheduler private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends ReachableMethodAnalysis {
 
     def processMethod(
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CGState.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CGState.scala
index aa872c3001..fcf7b55e85 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CGState.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CGState.scala
@@ -17,8 +17,8 @@ import org.opalj.tac.fpcf.properties.TACAI
  * @author Florian Kuebler
  */
 class CGState[ContextType <: Context](
-        override val callContext:                  ContextType,
-        override protected[this] var _tacDependee: EOptionP[Method, TACAI]
+    override val callContext:                  ContextType,
+    override protected[this] var _tacDependee: EOptionP[Method, TACAI]
 ) extends BaseAnalysisState with TypeIteratorState with TACAIBasedAnalysisState[ContextType] {
 
     // maps a definition site to the receiver var
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CallGraphAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CallGraphAnalysis.scala
index 600bdd0c12..08ee8a8553 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CallGraphAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CallGraphAnalysis.scala
@@ -54,7 +54,7 @@ import org.opalj.value.IsSObjectValue
  * @author Dominik Helm
  */
 class CallGraphAnalysis private[cg] (
-        override val project: SomeProject
+    override val project: SomeProject
 ) extends ReachableMethodAnalysis with TypeConsumerAnalysis {
     type LocalTypeInformation
 
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CallGraphDeserializer.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CallGraphDeserializer.scala
index 9dce57f790..668eb761b2 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CallGraphDeserializer.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CallGraphDeserializer.scala
@@ -71,10 +71,10 @@ object ReachableMethodDescription {
  * contains the set of computed target methods (`targets`).
  */
 case class CallSiteDescription(
-        declaredTarget: MethodDesc,
-        line:           Int,
-        pc:             Option[Int],
-        targets:        List[MethodDesc]
+    declaredTarget: MethodDesc,
+    line:           Int,
+    pc:             Option[Int],
+    targets:        List[MethodDesc]
 )
 
 object CallSiteDescription {
@@ -119,8 +119,8 @@ object MethodDesc {
  * @author Florian Kuebler
  */
 private class CallGraphDeserializer private[analyses] (
-        final val serializedCG: File,
-        final val project:      SomeProject
+    final val serializedCG: File,
+    final val project:      SomeProject
 ) extends FPCFAnalysis {
     private implicit val declaredMethods: DeclaredMethods = project.get(DeclaredMethodsKey)
     private val simpleContexts: SimpleContexts = project.get(SimpleContextsKey)
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CallSite.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CallSite.scala
index f5cec77975..4f4db6f847 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CallSite.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/CallSite.scala
@@ -9,8 +9,8 @@ import org.opalj.br.MethodDescriptor
 import org.opalj.br.ReferenceType
 
 case class CallSite(
-        pc:               Int,
-        methodName:       String,
-        methodDescriptor: MethodDescriptor,
-        receiver:         ReferenceType
+    pc:               Int,
+    methodName:       String,
+    methodDescriptor: MethodDescriptor,
+    receiver:         ReferenceType
 )
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/ConfiguredNativeMethodsCallGraphAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/ConfiguredNativeMethodsCallGraphAnalysis.scala
index 667fe87b1e..c8ce83bde6 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/ConfiguredNativeMethodsCallGraphAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/ConfiguredNativeMethodsCallGraphAnalysis.scala
@@ -49,7 +49,7 @@ import org.opalj.fpcf.SomeEPS
  * @author Florian Kuebler
  */
 class ConfiguredNativeMethodsCallGraphAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     val configKey = "org.opalj.fpcf.analyses.ConfiguredNativeMethodsAnalysis"
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/DoPrivilegedCGAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/DoPrivilegedCGAnalysis.scala
index ad270af6b0..6dbb90df42 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/DoPrivilegedCGAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/DoPrivilegedCGAnalysis.scala
@@ -52,9 +52,9 @@ import org.opalj.value.ValueInformation
  * @author Dominik Helm
  */
 class DoPrivilegedMethodAnalysis private[cg] (
-        final val doPrivilegedMethod: DeclaredMethod,
-        final val declaredRunMethod:  DeclaredMethod,
-        override val project:         SomeProject
+    final val doPrivilegedMethod: DeclaredMethod,
+    final val declaredRunMethod:  DeclaredMethod,
+    override val project:         SomeProject
 ) extends TACAIBasedAPIBasedAnalysis with TypeConsumerAnalysis {
 
     override def processNewCaller(
@@ -153,7 +153,7 @@ class DoPrivilegedMethodAnalysis private[cg] (
 }
 
 class DoPrivilegedCGAnalysis private[cg] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     def analyze(p: SomeProject): PropertyComputationResult = {
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/LoadedClassesAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/LoadedClassesAnalysis.scala
index 0361279a79..35218edd3a 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/LoadedClassesAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/LoadedClassesAnalysis.scala
@@ -41,7 +41,7 @@ import org.opalj.tac.fpcf.properties.TACAI
  * @author Florian Kuebler
  */
 class LoadedClassesAnalysis(
-        val project: SomeProject
+    val project: SomeProject
 ) extends FPCFAnalysis {
     /**
      * If the method in `callersOfMethod` has no callers
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/SerializationRelatedCallsAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/SerializationRelatedCallsAnalysis.scala
index b1e38ebe9e..429ea4ebd7 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/SerializationRelatedCallsAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/SerializationRelatedCallsAnalysis.scala
@@ -49,7 +49,7 @@ import org.opalj.value.ValueInformation
  * @author Dominik Helm
  */
 class OOSWriteObjectAnalysis private[analyses] (
-        override val project: SomeProject
+    override val project: SomeProject
 ) extends TACAIBasedAPIBasedAnalysis with TypeConsumerAnalysis {
 
     override val apiMethod: DeclaredMethod = declaredMethods(
@@ -241,7 +241,7 @@ class OOSWriteObjectAnalysis private[analyses] (
  * @author Florian Kuebler
  */
 class OISReadObjectAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends TACAIBasedAPIBasedAnalysis with TypeConsumerAnalysis {
 
     final val ObjectInputValidationType = ObjectType("java/io/ObjectInputValidation")
@@ -444,7 +444,7 @@ class OISReadObjectAnalysis private[analyses] (
  * @author Dominik Helm
  */
 class SerializationRelatedCallsAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     def process(p: SomeProject): PropertyComputationResult = {
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/StaticInitializerAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/StaticInitializerAnalysis.scala
index 10785240a9..f75b87995f 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/StaticInitializerAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/StaticInitializerAnalysis.scala
@@ -49,10 +49,10 @@ class StaticInitializerAnalysis(val project: SomeProject) extends FPCFAnalysis {
     private val declaredMethods: DeclaredMethods = project.get(DeclaredMethodsKey)
 
     private case class LCState(
-            // only present for non-final values
-            var lcDependee:      Option[EOptionP[SomeProject, LoadedClasses]],
-            var loadedClassesUB: Option[LoadedClasses],
-            var seenClasses:     Int
+        // only present for non-final values
+        var lcDependee:      Option[EOptionP[SomeProject, LoadedClasses]],
+        var loadedClassesUB: Option[LoadedClasses],
+        var seenClasses:     Int
     )
 
     /**
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/ThreadRelatedCallsAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/ThreadRelatedCallsAnalysis.scala
index 58f65b2a7c..212859f57d 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/ThreadRelatedCallsAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/ThreadRelatedCallsAnalysis.scala
@@ -47,8 +47,8 @@ class ThreadStartAnalysisResults extends IndirectCalls with VMReachableMethodsBa
  * @author Julius Naeumann
  */
 class ThreadStartAnalysis private[cg] (
-        override val project:   SomeProject,
-        override val apiMethod: DeclaredMethod
+    override val project:   SomeProject,
+    override val apiMethod: DeclaredMethod
 ) extends TACAIBasedAPIBasedAnalysis with TypeConsumerAnalysis {
 
     override def processNewCaller(
@@ -464,8 +464,8 @@ class ThreadStartAnalysis private[cg] (
 }
 
 class UncaughtExceptionHandlerAnalysis private[analyses] (
-        override val project:   SomeProject,
-        override val apiMethod: DeclaredMethod
+    override val project:   SomeProject,
+    override val apiMethod: DeclaredMethod
 ) extends TACAIBasedAPIBasedAnalysis with TypeConsumerAnalysis {
 
     override def processNewCaller(
@@ -599,7 +599,7 @@ class UncaughtExceptionHandlerAnalysis private[analyses] (
  * @author Michael Reif
  */
 class ThreadRelatedCallsAnalysis private[cg] (
-        val project: SomeProject
+    val project: SomeProject
 ) extends FPCFAnalysis {
 
     def process(p: SomeProject): PropertyComputationResult = {
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/TypeIterator.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/TypeIterator.scala
index f1747a05b1..3e9d17639b 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/TypeIterator.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/TypeIterator.scala
@@ -538,8 +538,8 @@ class RTATypeIterator(project: SomeProject)
  * entity plus a global set of types.
  */
 class PropagationBasedTypeIterator(
-        project:               SomeProject,
-        typeSetEntitySelector: TypeSetEntitySelector
+    project:               SomeProject,
+    typeSetEntitySelector: TypeSetEntitySelector
 ) extends TypeIterator(project) with SimpleContextProvider {
 
     override type InformationType = (InstantiatedTypes, InstantiatedTypes)
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/reflection/MethodMatcher.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/reflection/MethodMatcher.scala
index a09ba73cec..cbb2e8e9dd 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/reflection/MethodMatcher.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/reflection/MethodMatcher.scala
@@ -45,8 +45,8 @@ final class NameBasedMethodMatcher(val possibleNames: Set[String]) extends Metho
 }
 
 class ClassBasedMethodMatcher(
-        val possibleClasses:           Set[ObjectType],
-        val onlyMethodsExactlyInClass: Boolean
+    val possibleClasses:           Set[ObjectType],
+    val onlyMethodsExactlyInClass: Boolean
 ) extends MethodMatcher {
 
     // TODO use a ProjectInformationKey or WeakHashMap to cache methods per project
@@ -69,7 +69,7 @@ class ClassBasedMethodMatcher(
 }
 
 class DescriptorBasedMethodMatcher(
-        val possibleDescriptors: Set[MethodDescriptor]
+    val possibleDescriptors: Set[MethodDescriptor]
 ) extends MethodMatcher {
 
     override def initialMethods(implicit p: SomeProject): Iterator[Method] = {
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/reflection/ReflectionRelatedCallsAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/reflection/ReflectionRelatedCallsAnalysis.scala
index 88b4746e81..eea59fccf9 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/reflection/ReflectionRelatedCallsAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/reflection/ReflectionRelatedCallsAnalysis.scala
@@ -129,16 +129,16 @@ sealed trait ReflectionAnalysis extends TACAIBasedAPIBasedAnalysis {
 }
 
 class ClassForNameAnalysis private[analyses] (
-        final val project:            SomeProject,
-        override final val apiMethod: DeclaredMethod,
-        final val classNameIndex:     Int = 0
+    final val project:            SomeProject,
+    override final val apiMethod: DeclaredMethod,
+    final val classNameIndex:     Int = 0
 ) extends ReflectionAnalysis with TypeConsumerAnalysis {
 
     private class State(
-            val stmts:       Array[Stmt[V]],
-            loadedClassesUB: UIDSet[ObjectType],
-            callContext:     ContextType,
-            val callPC:      Int
+        val stmts:       Array[Stmt[V]],
+        loadedClassesUB: UIDSet[ObjectType],
+        callContext:     ContextType,
+        val callPC:      Int
     ) extends CGState[ContextType](callContext, null) {
         var hasFailed = false
 
@@ -311,7 +311,7 @@ class ClassForNameAnalysis private[analyses] (
 }
 
 class ClassNewInstanceAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends ReflectionAnalysis with TypeConsumerAnalysis {
 
     override val apiMethod: DeclaredMethod =
@@ -464,7 +464,7 @@ class ClassNewInstanceAnalysis private[analyses] (
 }
 
 class ConstructorNewInstanceAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends ReflectionAnalysis with TypeConsumerAnalysis {
 
     private[this] val ConstructorT = ObjectType("java/lang/reflect/Constructor")
@@ -713,7 +713,7 @@ class ConstructorNewInstanceAnalysis private[analyses] (
 }
 
 class MethodInvokeAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends ReflectionAnalysis with TypeConsumerAnalysis {
 
     override val apiMethod: DeclaredMethod = declaredMethods(
@@ -1035,9 +1035,9 @@ class MethodInvokeAnalysis private[analyses] (
 }
 
 class MethodHandleInvokeAnalysis private[analyses] (
-        final val project:                SomeProject,
-        override final val apiMethod:     DeclaredMethod,
-        final val isSignaturePolymorphic: Boolean
+    final val project:                SomeProject,
+    override final val apiMethod:     DeclaredMethod,
+    final val isSignaturePolymorphic: Boolean
 ) extends ReflectionAnalysis with TypeConsumerAnalysis {
 
     override def processNewCaller(
@@ -1532,7 +1532,7 @@ object ReflectionRelatedCallsAnalysis {
  * @author Dominik Helm
  */
 class ReflectionRelatedCallsAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     def process(p: SomeProject): PropertyComputationResult = {
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/reflection/TamiFlexCallGraphAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/reflection/TamiFlexCallGraphAnalysis.scala
index 08d20dab67..8725d8d631 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/reflection/TamiFlexCallGraphAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/reflection/TamiFlexCallGraphAnalysis.scala
@@ -39,7 +39,7 @@ import org.opalj.value.ValueInformation
  * @author Florian Kuebler
  */
 class TamiFlexCallGraphAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     val declaredMethods: DeclaredMethods = project.get(DeclaredMethodsKey)
@@ -86,9 +86,9 @@ class TamiFlexCallGraphAnalysis private[analyses] (
 }
 
 class TamiFlexMethodInvokeAnalysis private[analyses] (
-        final val project:      SomeProject,
-        override val apiMethod: DeclaredMethod,
-        val key:                String
+    final val project:      SomeProject,
+    override val apiMethod: DeclaredMethod,
+    val key:                String
 ) extends TACAIBasedAPIBasedAnalysis with TypeConsumerAnalysis {
 
     private[this] final val tamiFlexLogData = project.get(TamiFlexKey)
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/rta/ConfiguredNativeMethodsInstantiatedTypesAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/rta/ConfiguredNativeMethodsInstantiatedTypesAnalysis.scala
index 29107137ca..80a6432172 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/rta/ConfiguredNativeMethodsInstantiatedTypesAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/rta/ConfiguredNativeMethodsInstantiatedTypesAnalysis.scala
@@ -40,7 +40,7 @@ import org.opalj.fpcf.PropertyStore
  * @author Florian Kuebler
  */
 class ConfiguredNativeMethodsInstantiatedTypesAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     private[this] implicit val declaredMethods: DeclaredMethods = p.get(DeclaredMethodsKey)
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/rta/InstantiatedTypesAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/rta/InstantiatedTypesAnalysis.scala
index 8a99450d03..2f42a93275 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/rta/InstantiatedTypesAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/rta/InstantiatedTypesAnalysis.scala
@@ -48,7 +48,7 @@ import org.opalj.fpcf.SomeEPS
  * @author Dominik Helm
  */
 class InstantiatedTypesAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     private[this] implicit val contextProvider: ContextProvider = project.get(ContextProviderKey)
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/ArrayInstantiationsAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/ArrayInstantiationsAnalysis.scala
index baa01019c7..25d111036f 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/ArrayInstantiationsAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/ArrayInstantiationsAnalysis.scala
@@ -41,8 +41,8 @@ import org.opalj.tac.fpcf.properties.TACAI
  * @author Andreas Bauer
  */
 final class ArrayInstantiationsAnalysis(
-        val project:     SomeProject,
-        selectSetEntity: TypeSetEntitySelector
+    val project:     SomeProject,
+    selectSetEntity: TypeSetEntitySelector
 ) extends ReachableMethodAnalysis {
 
     override def processMethod(
@@ -114,7 +114,7 @@ final class ArrayInstantiationsAnalysis(
 }
 
 class ArrayInstantiationsAnalysisScheduler(
-        selectSetEntity: TypeSetEntitySelector
+    selectSetEntity: TypeSetEntitySelector
 ) extends BasicFPCFTriggeredAnalysisScheduler {
 
     override def requiredProjectInformation: ProjectInformationKeys = Seq(TypeIteratorKey)
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/InstantiatedTypesAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/InstantiatedTypesAnalysis.scala
index 6b5476c521..037fca32cb 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/InstantiatedTypesAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/InstantiatedTypesAnalysis.scala
@@ -65,8 +65,8 @@ import org.opalj.fpcf.UBP
  * @author Andreas Bauer
  */
 class InstantiatedTypesAnalysis private[analyses] (
-        final val project:     SomeProject,
-        val setEntitySelector: TypeSetEntitySelector
+    final val project:     SomeProject,
+    val setEntitySelector: TypeSetEntitySelector
 ) extends FPCFAnalysis {
 
     private[this] implicit val contextProvider: ContextProvider = project.get(ContextProviderKey)
@@ -264,7 +264,7 @@ class InstantiatedTypesAnalysis private[analyses] (
 }
 
 class InstantiatedTypesAnalysisScheduler(
-        val selectSetEntity: TypeSetEntitySelector
+    val selectSetEntity: TypeSetEntitySelector
 ) extends BasicFPCFTriggeredAnalysisScheduler {
 
     override def requiredProjectInformation: ProjectInformationKeys = Seq(
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/LibraryInstantiatedTypesBasedEntryPointsAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/LibraryInstantiatedTypesBasedEntryPointsAnalysis.scala
index 1bfc33b8fe..bd89dbb866 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/LibraryInstantiatedTypesBasedEntryPointsAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/LibraryInstantiatedTypesBasedEntryPointsAnalysis.scala
@@ -50,7 +50,7 @@ import org.opalj.fpcf.UBPS
  * @author Andreas Bauer
  */
 class LibraryInstantiatedTypesBasedEntryPointsAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     val declaredMethods: DeclaredMethods = project.get(DeclaredMethodsKey)
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/TypePropagationAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/TypePropagationAnalysis.scala
index 69ebf3caa2..c9d7318881 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/TypePropagationAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/TypePropagationAnalysis.scala
@@ -54,8 +54,8 @@ import org.opalj.tac.fpcf.properties.TACAI
  * @author Andreas Bauer
  */
 final class TypePropagationAnalysis private[analyses] (
-        val project:         SomeProject,
-        selectTypeSetEntity: TypeSetEntitySelector
+    val project:         SomeProject,
+    selectTypeSetEntity: TypeSetEntitySelector
 ) extends ReachableMethodAnalysis {
 
     private[this] val debug = false
@@ -574,7 +574,7 @@ final class TypePropagationAnalysis private[analyses] (
 }
 
 final class TypePropagationAnalysisScheduler(
-        val selectSetEntity: TypeSetEntitySelector
+    val selectSetEntity: TypeSetEntitySelector
 ) extends BasicFPCFTriggeredAnalysisScheduler {
 
     override def requiredProjectInformation: ProjectInformationKeys = Seq(TypeIteratorKey, DeclaredFieldsKey)
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/TypePropagationState.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/TypePropagationState.scala
index 7c26cc04f7..034254843f 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/TypePropagationState.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/cg/xta/TypePropagationState.scala
@@ -38,13 +38,13 @@ import org.opalj.tac.fpcf.properties.TACAI
  * @param _calleeDependee Dependee for the callee property of the method.
  */
 final class TypePropagationState[ContextType <: Context](
-        override val callContext:                        ContextType,
-        val typeSetEntity:                               TypeSetEntity,
-        override protected[this] var _tacDependee:       EOptionP[Method, TACAI],
-        private[this] var _ownInstantiatedTypesDependee: EOptionP[TypeSetEntity, InstantiatedTypes],
-        private[this] var _calleeDependee:               EOptionP[DeclaredMethod, Callees],
-        private[this] var _readAccessDependee:           EOptionP[Method, MethodFieldReadAccessInformation],
-        private[this] var _writeAccessDependee:          EOptionP[Method, MethodFieldWriteAccessInformation]
+    override val callContext:                        ContextType,
+    val typeSetEntity:                               TypeSetEntity,
+    override protected[this] var _tacDependee:       EOptionP[Method, TACAI],
+    private[this] var _ownInstantiatedTypesDependee: EOptionP[TypeSetEntity, InstantiatedTypes],
+    private[this] var _calleeDependee:               EOptionP[DeclaredMethod, Callees],
+    private[this] var _readAccessDependee:           EOptionP[Method, MethodFieldReadAccessInformation],
+    private[this] var _writeAccessDependee:          EOptionP[Method, MethodFieldWriteAccessInformation]
 ) extends BaseAnalysisState with TACAIBasedAnalysisState[ContextType] {
 
     var methodWritesArrays: Boolean = false
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/escape/InterProceduralEscapeAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/escape/InterProceduralEscapeAnalysis.scala
index fdbdeaf698..37ea2619e7 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/escape/InterProceduralEscapeAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/escape/InterProceduralEscapeAnalysis.scala
@@ -45,13 +45,13 @@ import org.opalj.tac.fpcf.properties.TACAI
 import org.opalj.value.ValueInformation
 
 class InterProceduralEscapeAnalysisContext(
-        val entity:                  (Context, Entity),
-        val targetMethod:            Method,
-        val declaredMethods:         DeclaredMethods,
-        val virtualFormalParameters: VirtualFormalParameters,
-        val project:                 SomeProject,
-        val propertyStore:           PropertyStore,
-        val isMethodOverridable:     Method => Answer
+    val entity:                  (Context, Entity),
+    val targetMethod:            Method,
+    val declaredMethods:         DeclaredMethods,
+    val virtualFormalParameters: VirtualFormalParameters,
+    val project:                 SomeProject,
+    val propertyStore:           PropertyStore,
+    val isMethodOverridable:     Method => Answer
 ) extends AbstractEscapeAnalysisContext
     with PropertyStoreContainer
     with IsMethodOverridableContainer
@@ -67,7 +67,7 @@ class InterProceduralEscapeAnalysisState
  * @author Florian Kübler
  */
 class InterProceduralEscapeAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends DefaultEscapeAnalysis
     with AbstractInterProceduralEscapeAnalysis
     with ConstructorSensitiveEscapeAnalysis
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/escape/ReturnValueFreshnessAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/escape/ReturnValueFreshnessAnalysis.scala
index 61fafdbdf9..50e2d7a54c 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/escape/ReturnValueFreshnessAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/escape/ReturnValueFreshnessAnalysis.scala
@@ -175,7 +175,7 @@ class ReturnValueFreshnessState(val context: Context) {
  * @author Dominik Helm
  */
 class ReturnValueFreshnessAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     private[this] implicit val declaredMethods: DeclaredMethods = project.get(DeclaredMethodsKey)
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/escape/SimpleEscapeAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/escape/SimpleEscapeAnalysis.scala
index 0fbb75d9cf..62eaf00319 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/escape/SimpleEscapeAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/escape/SimpleEscapeAnalysis.scala
@@ -33,12 +33,12 @@ import org.opalj.tac.common.DefinitionSitesKey
 import org.opalj.tac.fpcf.properties.TACAI
 
 class SimpleEscapeAnalysisContext(
-        val entity:                  (Context, Entity),
-        val targetMethod:            Method,
-        val declaredMethods:         DeclaredMethods,
-        val virtualFormalParameters: VirtualFormalParameters,
-        val project:                 SomeProject,
-        val propertyStore:           PropertyStore
+    val entity:                  (Context, Entity),
+    val targetMethod:            Method,
+    val declaredMethods:         DeclaredMethods,
+    val virtualFormalParameters: VirtualFormalParameters,
+    val project:                 SomeProject,
+    val propertyStore:           PropertyStore
 ) extends AbstractEscapeAnalysisContext
     with PropertyStoreContainer
     with VirtualFormalParametersContainer
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldaccess/FieldAccessInformationAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldaccess/FieldAccessInformationAnalysis.scala
index 9c9cfb85e0..57b47f5fdf 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldaccess/FieldAccessInformationAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldaccess/FieldAccessInformationAnalysis.scala
@@ -46,8 +46,8 @@ class FieldAccessInformationAnalysis(val project: SomeProject) extends FPCFAnaly
     type ContextType <: Context
 
     private[this] class State(
-            override val callContext:                  ContextType,
-            override protected[this] var _tacDependee: EOptionP[Method, TACAI]
+        override val callContext:                  ContextType,
+        override protected[this] var _tacDependee: EOptionP[Method, TACAI]
     ) extends BaseAnalysisState with TACAIBasedAnalysisState[ContextType]
 
     private val declaredMethods = project.get(DeclaredMethodsKey)
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldaccess/reflection/FieldMatcher.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldaccess/reflection/FieldMatcher.scala
index ea174fc72c..523bd43143 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldaccess/reflection/FieldMatcher.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldaccess/reflection/FieldMatcher.scala
@@ -39,8 +39,8 @@ final class NameBasedFieldMatcher(val possibleNames: Set[String]) extends FieldM
 }
 
 class ClassBasedFieldMatcher(
-        val possibleClasses:          Set[ObjectType],
-        val onlyFieldsExactlyInClass: Boolean
+    val possibleClasses:          Set[ObjectType],
+    val onlyFieldsExactlyInClass: Boolean
 ) extends FieldMatcher {
 
     // IMPROVE use a ProjectInformationKey or WeakHashMap to cache fields per class per project (for the contains check)
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldaccess/reflection/ReflectionRelatedFieldAccessesAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldaccess/reflection/ReflectionRelatedFieldAccessesAnalysis.scala
index af3b59db65..5edf2f2e39 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldaccess/reflection/ReflectionRelatedFieldAccessesAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldaccess/reflection/ReflectionRelatedFieldAccessesAnalysis.scala
@@ -77,8 +77,8 @@ import org.opalj.value.ValueInformation
  * @author Maximilian Rüsch
  */
 private[reflection] class ReflectionState[ContextType <: Context](
-        override val callContext:                  ContextType,
-        override protected[this] var _tacDependee: EOptionP[Method, TACAI]
+    override val callContext:                  ContextType,
+    override protected[this] var _tacDependee: EOptionP[Method, TACAI]
 ) extends BaseAnalysisState with TypeIteratorState with TACAIBasedAnalysisState[ContextType]
 
 sealed trait ReflectionAnalysis extends TACAIBasedAPIBasedAnalysis {
@@ -144,36 +144,36 @@ sealed trait ReflectionAnalysis extends TACAIBasedAPIBasedAnalysis {
 sealed trait FieldInstanceBasedReflectiveFieldAccessAnalysis extends ReflectionAnalysis with TypeConsumerAnalysis {
 
     protected case class FieldDepender(
-            pc:       Int,
-            receiver: AccessReceiver,
-            param:    Option[AccessParameter],
-            matchers: Set[FieldMatcher]
+        pc:       Int,
+        receiver: AccessReceiver,
+        param:    Option[AccessParameter],
+        matchers: Set[FieldMatcher]
     )
     private case class ArrayDepender(
-            pc:               Int,
-            receiver:         AccessReceiver,
-            param:            Option[AccessParameter],
-            matchers:         Set[FieldMatcher],
-            arrayVar:         V,
-            callerStatements: Array[Stmt[V]]
+        pc:               Int,
+        receiver:         AccessReceiver,
+        param:            Option[AccessParameter],
+        matchers:         Set[FieldMatcher],
+        arrayVar:         V,
+        callerStatements: Array[Stmt[V]]
     )
     private case class NameDepender(
-            pc:               Int,
-            receiver:         AccessReceiver,
-            param:            Option[AccessParameter],
-            matchers:         Set[FieldMatcher],
-            nameVar:          V,
-            callerStatements: Array[Stmt[V]],
-            classVar:         V,
-            callerContext:    ContextType
+        pc:               Int,
+        receiver:         AccessReceiver,
+        param:            Option[AccessParameter],
+        matchers:         Set[FieldMatcher],
+        nameVar:          V,
+        callerStatements: Array[Stmt[V]],
+        classVar:         V,
+        callerContext:    ContextType
     )
     private case class ClassDepender(
-            pc:               Int,
-            receiver:         AccessReceiver,
-            param:            Option[AccessParameter],
-            matchers:         Set[FieldMatcher],
-            classVar:         V,
-            callerStatements: Array[Stmt[V]]
+        pc:               Int,
+        receiver:         AccessReceiver,
+        param:            Option[AccessParameter],
+        matchers:         Set[FieldMatcher],
+        classVar:         V,
+        callerStatements: Array[Stmt[V]]
     )
 
     override final def processNewCaller(
@@ -495,9 +495,9 @@ sealed trait FieldInstanceBasedReflectiveFieldAccessAnalysis extends ReflectionA
 }
 
 class FieldGetAnalysis private[analyses] (
-        final val project:       SomeProject,
-        final val apiMethodName: String,
-        final val fieldType:     Option[BaseType]
+    final val project:       SomeProject,
+    final val apiMethodName: String,
+    final val fieldType:     Option[BaseType]
 ) extends ReflectionAnalysis with FieldInstanceBasedReflectiveFieldAccessAnalysis {
 
     override val apiMethod: DeclaredMethod = declaredMethods(
@@ -576,9 +576,9 @@ class FieldGetAnalysis private[analyses] (
 }
 
 class FieldSetAnalysis private[analyses] (
-        final val project:       SomeProject,
-        final val apiMethodName: String,
-        final val fieldType:     Option[BaseType]
+    final val project:       SomeProject,
+    final val apiMethodName: String,
+    final val fieldType:     Option[BaseType]
 ) extends ReflectionAnalysis with FieldInstanceBasedReflectiveFieldAccessAnalysis {
 
     override val apiMethod: DeclaredMethod = declaredMethods(
@@ -668,10 +668,10 @@ class FieldSetAnalysis private[analyses] (
 }
 
 class MethodHandleInvokeAnalysis private[analyses] (
-        final val project:                SomeProject,
-        final val apiMethodName:          String,
-        final val parameterType:          Option[FieldType],
-        final val isSignaturePolymorphic: Boolean
+    final val project:                SomeProject,
+    final val apiMethodName:          String,
+    final val parameterType:          Option[FieldType],
+    final val isSignaturePolymorphic: Boolean
 ) extends ReflectionAnalysis with TypeConsumerAnalysis {
 
     override final val apiMethod =
@@ -739,29 +739,29 @@ class MethodHandleInvokeAnalysis private[analyses] (
     }
 
     private case class MethodHandleDepender(
-            pc:                     Int,
-            descriptor:             Option[MethodDescriptor],
-            invokeParams:           Option[Seq[Option[V]]],
-            persistentActualParams: Seq[Option[(ValueInformation, PCs)]],
-            matchers:               Set[FieldMatcher]
+        pc:                     Int,
+        descriptor:             Option[MethodDescriptor],
+        invokeParams:           Option[Seq[Option[V]]],
+        persistentActualParams: Seq[Option[(ValueInformation, PCs)]],
+        matchers:               Set[FieldMatcher]
     )
     private case class NameDepender(
-            pc:                     Int,
-            isStatic:               Boolean,
-            persistentActualParams: Seq[Option[(ValueInformation, PCs)]],
-            matchers:               Set[FieldMatcher],
-            nameVar:                V,
-            stmts:                  Array[Stmt[V]],
-            classVar:               V,
-            accessContext:          ContextType
+        pc:                     Int,
+        isStatic:               Boolean,
+        persistentActualParams: Seq[Option[(ValueInformation, PCs)]],
+        matchers:               Set[FieldMatcher],
+        nameVar:                V,
+        stmts:                  Array[Stmt[V]],
+        classVar:               V,
+        accessContext:          ContextType
     )
     private case class ClassDepender(
-            pc:                     Int,
-            isStatic:               Boolean,
-            persistentActualParams: Seq[Option[(ValueInformation, PCs)]],
-            matchers:               Set[FieldMatcher],
-            classVar:               V,
-            stmts:                  Array[Stmt[V]]
+        pc:                     Int,
+        isStatic:               Boolean,
+        persistentActualParams: Seq[Option[(ValueInformation, PCs)]],
+        matchers:               Set[FieldMatcher],
+        classVar:               V,
+        stmts:                  Array[Stmt[V]]
     )
 
     private def continuation(
@@ -994,11 +994,11 @@ class MethodHandleInvokeAnalysis private[analyses] (
             }
         } else if (definition.isVirtualFunctionCall) {
             case class MethodHandleData(
-                    classVar:  V,
-                    nameVar:   V,
-                    fieldType: Expr[V],
-                    isStatic:  Boolean,
-                    isSetter:  Boolean
+                classVar:  V,
+                nameVar:   V,
+                fieldType: Expr[V],
+                isStatic:  Boolean,
+                isSetter:  Boolean
             )
 
             def handleParams(params: Seq[Expr[V]], isStatic: Boolean, isSetter: Boolean): MethodHandleData = {
@@ -1124,7 +1124,7 @@ object ReflectionRelatedFieldAccessesAnalysis {
  * @author Maximilian Rüsch
  */
 class ReflectionRelatedFieldAccessesAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     def process(): PropertyComputationResult = {
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldassignability/L2FieldAssignabilityAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldassignability/L2FieldAssignabilityAnalysis.scala
index 09ef67c898..da3409920b 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldassignability/L2FieldAssignabilityAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/fieldassignability/L2FieldAssignabilityAnalysis.scala
@@ -268,7 +268,7 @@ class L2FieldAssignabilityAnalysis private[analyses] (val project: SomeProject)
     }
 
     case class State(
-            field: Field
+        field: Field
     ) extends AbstractFieldAssignabilityAnalysisState {
         var checkLazyInit: Option[(Method, Int, Int, TACode[TACMethodParameter, V])] = None
         var openWrites = List.empty[(DefinedMethod, TACode[TACMethodParameter, V], Option[V], PC)]
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/ifds/JavaIFDSProblem.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/ifds/JavaIFDSProblem.scala
index 088eb4d879..84917df12f 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/ifds/JavaIFDSProblem.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/ifds/JavaIFDSProblem.scala
@@ -34,10 +34,10 @@ import org.opalj.value.ValueInformation
  * @author Marc Clement
  */
 case class JavaStatement(
-        method: Method,
-        index:  Int,
-        code:   Array[Stmt[V]],
-        cfg:    CFG[Stmt[V], TACStmts[V]]
+    method: Method,
+    index:  Int,
+    code:   Array[Stmt[V]],
+    cfg:    CFG[Stmt[V], TACStmts[V]]
 ) extends Statement[Method, CFGNode] {
 
     override def hashCode(): Int = method.hashCode() * 31 + index
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/AllocationSiteBasedPointsToAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/AllocationSiteBasedPointsToAnalysis.scala
index 3b6617d8f3..659f584fab 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/AllocationSiteBasedPointsToAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/AllocationSiteBasedPointsToAnalysis.scala
@@ -10,7 +10,7 @@ import org.opalj.br.fpcf.properties.pointsto.AllocationSitePointsToSet
 import org.opalj.fpcf.PropertyMetaInformation
 
 class AllocationSiteBasedPointsToAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends AbstractPointsToAnalysis with AllocationSiteBasedAnalysis
 
 object AllocationSiteBasedPointsToAnalysisScheduler extends AbstractPointsToAnalysisScheduler {
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/ArraycopyPointsToAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/ArraycopyPointsToAnalysis.scala
index e561c7ee0b..64119cae0a 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/ArraycopyPointsToAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/ArraycopyPointsToAnalysis.scala
@@ -37,7 +37,7 @@ import org.opalj.tac.fpcf.properties.TheTACAI
  * @author Dominik Helm
  */
 abstract class ArraycopyPointsToAnalysis private[pointsto] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends PointsToAnalysisBase with TACAIBasedAPIBasedAnalysis {
 
     override val apiMethod: DeclaredMethod = declaredMethods(
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/ConfiguredMethodsPointsToAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/ConfiguredMethodsPointsToAnalysis.scala
index 31385eedbb..fbafab7c5d 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/ConfiguredMethodsPointsToAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/ConfiguredMethodsPointsToAnalysis.scala
@@ -49,7 +49,7 @@ import org.opalj.tac.fpcf.analyses.cg.TypeConsumerAnalysis
  * @author Florian Kuebler
  */
 abstract class ConfiguredMethodsPointsToAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends PointsToAnalysisBase with TypeConsumerAnalysis {
 
     private[this] implicit val declaredMethods: DeclaredMethods = p.get(DeclaredMethodsKey)
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/NewInstanceAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/NewInstanceAnalysis.scala
index fe0070c05e..96cee0ed7f 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/NewInstanceAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/NewInstanceAnalysis.scala
@@ -41,7 +41,7 @@ import org.opalj.tac.common.DefinitionSite
  * @author Dominik Helm
  */
 abstract class NewInstanceAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends PointsToAnalysisBase { self =>
 
     val declaredMethods: DeclaredMethods = project.get(DeclaredMethodsKey)
@@ -114,8 +114,8 @@ abstract class NewInstanceAnalysis private[analyses] (
 }
 
 abstract class NewInstanceMethodAnalysis(
-        final val project:            SomeProject,
-        override final val apiMethod: DeclaredMethod
+    final val project:            SomeProject,
+    override final val apiMethod: DeclaredMethod
 ) extends PointsToAnalysisBase with APIBasedAnalysis {
 
     override def handleNewCaller(
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/PointsToAnalysisState.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/PointsToAnalysisState.scala
index 9b912d3062..fdfb20e924 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/PointsToAnalysisState.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/PointsToAnalysisState.scala
@@ -48,8 +48,8 @@ class PointsToAnalysisState[
     PointsToSet <: PointsToSetLike[ElementType, _, PointsToSet],
     ContextType <: Context
 ](
-        override val callContext:                  ContextType,
-        override protected[this] var _tacDependee: EOptionP[Method, TACAI]
+    override val callContext:                  ContextType,
+    override protected[this] var _tacDependee: EOptionP[Method, TACAI]
 ) extends BaseAnalysisState with TACAIBasedAnalysisState[ContextType] {
 
     private[this] val getFields: ArrayBuffer[(Entity, Option[DeclaredField], ReferenceType => Boolean)] =
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/ReflectionAllocationsAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/ReflectionAllocationsAnalysis.scala
index ffc5763c27..abe4f3bc62 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/ReflectionAllocationsAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/ReflectionAllocationsAnalysis.scala
@@ -33,7 +33,7 @@ import org.opalj.fpcf.Results
  * @author Dominik Helm
  */
 class ReflectionAllocationsAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends FPCFAnalysis {
 
     val declaredMethods: DeclaredMethods = project.get(DeclaredMethodsKey)
@@ -254,8 +254,8 @@ class ReflectionAllocationsAnalysis private[analyses] (
 }
 
 class ReflectionMethodAllocationsAnalysis(
-        final val project:            SomeProject,
-        override final val apiMethod: DeclaredMethod
+    final val project:            SomeProject,
+    override final val apiMethod: DeclaredMethod
 ) extends PointsToAnalysisBase with AllocationSiteBasedAnalysis with APIBasedAnalysis {
 
     override def handleNewCaller(
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/SerializationAllocationsAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/SerializationAllocationsAnalysis.scala
index 05a23c0bb5..c3812457ab 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/SerializationAllocationsAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/SerializationAllocationsAnalysis.scala
@@ -32,7 +32,7 @@ import org.opalj.fpcf.Results
  * @author Dominik Helm
  */
 abstract class SerializationAllocationsAnalysis(
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends PointsToAnalysisBase with TACAIBasedAPIBasedAnalysis { self =>
 
     override final val apiMethod: DeclaredMethod = declaredMethods(
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/TamiFlexKey.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/TamiFlexKey.scala
index e2342113b8..d2be0b2d4a 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/TamiFlexKey.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/TamiFlexKey.scala
@@ -27,18 +27,18 @@ import org.opalj.log.OPALLogger
  * @author Florian Kuebler
  */
 class TamiFlexLogData(
-        private[this] val _classes: scala.collection.Map[
-            (String /*Caller*/, String /*Reflection Method*/, Int /*Line Number*/ ),
-            scala.collection.Set[ReferenceType]
-        ],
-        private[this] val _methods: scala.collection.Map[
-            (String /*Caller*/, String /*Reflection Method*/, Int /*Line Number*/ ),
-            scala.collection.Set[DeclaredMethod]
-        ],
-        private[this] val _fields: scala.collection.Map[
-            (String /*Caller*/, String /*Reflection Method*/, Int /*Line Number*/ ),
-            scala.collection.Set[Field]
-        ]
+    private[this] val _classes: scala.collection.Map[
+        (String /*Caller*/, String /*Reflection Method*/, Int /*Line Number*/ ),
+        scala.collection.Set[ReferenceType]
+    ],
+    private[this] val _methods: scala.collection.Map[
+        (String /*Caller*/, String /*Reflection Method*/, Int /*Line Number*/ ),
+        scala.collection.Set[DeclaredMethod]
+    ],
+    private[this] val _fields: scala.collection.Map[
+        (String /*Caller*/, String /*Reflection Method*/, Int /*Line Number*/ ),
+        scala.collection.Set[Field]
+    ]
 ) {
     private[this] def toMethodDesc(method: DeclaredMethod): String = {
         s"${method.declaringClassType.toJava}.${method.name}"
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/TamiFlexPointsToAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/TamiFlexPointsToAnalysis.scala
index 4e407e909c..cde4e0ee8c 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/TamiFlexPointsToAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/TamiFlexPointsToAnalysis.scala
@@ -42,7 +42,7 @@ import org.opalj.tac.fpcf.properties.TheTACAI
  * @author Florian Kuebler
  */
 abstract class TamiFlexPointsToAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends PointsToAnalysisBase { self =>
 
     trait PointsToBase extends AbstractPointsToBasedAnalysis {
@@ -240,7 +240,7 @@ object AllocationSiteBasedTamiFlexPointsToAnalysisScheduler
 }
 
 abstract class TamiFlexPointsToArrayGetAnalysis(
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends PointsToAnalysisBase with TACAIBasedAPIBasedAnalysis {
 
     override val apiMethod: DeclaredMethod = declaredMethods(
@@ -286,7 +286,7 @@ abstract class TamiFlexPointsToArrayGetAnalysis(
 }
 
 abstract class TamiFlexPointsToArraySetAnalysis(
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends PointsToAnalysisBase with TACAIBasedAPIBasedAnalysis {
 
     override val apiMethod: DeclaredMethod = declaredMethods(
@@ -333,9 +333,9 @@ abstract class TamiFlexPointsToArraySetAnalysis(
 }
 
 abstract class TamiFlexPointsToNewInstanceAnalysis(
-        final val project:      SomeProject,
-        override val apiMethod: DeclaredMethod,
-        val key:                String
+    final val project:      SomeProject,
+    override val apiMethod: DeclaredMethod,
+    val key:                String
 ) extends PointsToAnalysisBase with APIBasedAnalysis {
 
     private[this] final val tamiFlexLogData = project.get(TamiFlexKey)
@@ -363,17 +363,17 @@ abstract class TamiFlexPointsToNewInstanceAnalysis(
 }
 
 abstract class TamiFlexPointsToClassGetMemberAnalysis(
-        final val project: SomeProject,
-        val method:        String,
-        val memberType:    ObjectType
+    final val project: SomeProject,
+    val method:        String,
+    val memberType:    ObjectType
 )(
-        override val apiMethod: DeclaredMethod = project.get(DeclaredMethodsKey)(
-            ObjectType.Class,
-            "",
-            ObjectType.Class,
-            method,
-            MethodDescriptor(ObjectType.String, memberType)
-        )
+    override val apiMethod: DeclaredMethod = project.get(DeclaredMethodsKey)(
+        ObjectType.Class,
+        "",
+        ObjectType.Class,
+        method,
+        MethodDescriptor(ObjectType.String, memberType)
+    )
 ) extends PointsToAnalysisBase with APIBasedAnalysis {
 
     private[this] final val tamiFlexLogData = project.get(TamiFlexKey)
@@ -412,9 +412,9 @@ abstract class TamiFlexPointsToClassGetMemberAnalysis(
 }
 
 abstract class TamiFlexPointsToClassGetMembersAnalysis(
-        final val project: SomeProject,
-        method:            String,
-        val memberType:    ObjectType
+    final val project: SomeProject,
+    method:            String,
+    val memberType:    ObjectType
 ) extends PointsToAnalysisBase with APIBasedAnalysis {
 
     override val apiMethod: DeclaredMethod = project.get(DeclaredMethodsKey)(
@@ -454,7 +454,7 @@ abstract class TamiFlexPointsToClassGetMembersAnalysis(
 }
 
 abstract class TamiFlexPointsToFieldGetAnalysis(
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends PointsToAnalysisBase with TACAIBasedAPIBasedAnalysis {
 
     override val apiMethod: DeclaredMethod = declaredMethods(
@@ -500,7 +500,7 @@ abstract class TamiFlexPointsToFieldGetAnalysis(
 }
 
 abstract class TamiFlexPointsToFieldSetAnalysis(
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends PointsToAnalysisBase with TACAIBasedAPIBasedAnalysis {
 
     override val apiMethod: DeclaredMethod = declaredMethods(
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/TypeBasedPointsToAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/TypeBasedPointsToAnalysis.scala
index f85564726f..b120cd78ca 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/TypeBasedPointsToAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/TypeBasedPointsToAnalysis.scala
@@ -27,7 +27,7 @@ import org.opalj.fpcf.PropertyMetaInformation
  * @author Florian Kuebler
  */
 class TypeBasedPointsToAnalysis private[analyses] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends AbstractPointsToAnalysis with TypeBasedAnalysis
 
 object TypeBasedPointsToAnalysisScheduler extends AbstractPointsToAnalysisScheduler {
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/UnsafePointsToAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/UnsafePointsToAnalysis.scala
index 86dcce2db6..ad55683fe2 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/UnsafePointsToAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/pointsto/UnsafePointsToAnalysis.scala
@@ -40,7 +40,7 @@ import org.opalj.tac.fpcf.properties.TheTACAI
  * @author Dominik Helm
  */
 abstract class UnsafePointsToAnalysis private[pointsto] (
-        final val project: SomeProject
+    final val project: SomeProject
 ) extends PointsToAnalysisBase { self =>
 
     private[this] val UnsafeT = ObjectType("sun/misc/Unsafe")
@@ -204,8 +204,8 @@ abstract class UnsafePointsToAnalysis private[pointsto] (
 }
 
 abstract class UnsafeGetPointsToAnalysis(
-        final val project:      SomeProject,
-        override val apiMethod: DeclaredMethod
+    final val project:      SomeProject,
+    override val apiMethod: DeclaredMethod
 ) extends PointsToAnalysisBase with TACAIBasedAPIBasedAnalysis {
 
     def processNewCaller(
@@ -235,9 +235,9 @@ abstract class UnsafeGetPointsToAnalysis(
 }
 
 abstract class UnsafePutPointsToAnalysis(
-        final val project:      SomeProject,
-        val index:              Int,
-        override val apiMethod: DeclaredMethod
+    final val project:      SomeProject,
+    val index:              Int,
+    override val apiMethod: DeclaredMethod
 ) extends PointsToAnalysisBase with TACAIBasedAPIBasedAnalysis {
 
     def processNewCaller(
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/purity/L1PurityAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/purity/L1PurityAnalysis.scala
index 51a0cadddb..9b9fa5b690 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/purity/L1PurityAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/purity/L1PurityAnalysis.scala
@@ -100,13 +100,13 @@ class L1PurityAnalysis private[analyses] (val project: SomeProject) extends Abst
      *                  checkPurityOfX methods to aggregrate the purity
      */
     class State(
-            var dependees: Set[EOptionP[Entity, Property]],
-            val method:    Method,
-            val context:   Context,
-            val declClass: ObjectType,
-            var tac:       TACode[TACMethodParameter, V] = null,
-            var lbPurity:  Purity                        = Pure,
-            var ubPurity:  Purity                        = Pure
+        var dependees: Set[EOptionP[Entity, Property]],
+        val method:    Method,
+        val context:   Context,
+        val declClass: ObjectType,
+        var tac:       TACode[TACMethodParameter, V] = null,
+        var lbPurity:  Purity                        = Pure,
+        var ubPurity:  Purity                        = Pure
     ) extends AnalysisState
 
     override type StateType = State
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/purity/L2PurityAnalysis.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/purity/L2PurityAnalysis.scala
index 836ad31905..dea181ad07 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/purity/L2PurityAnalysis.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/purity/L2PurityAnalysis.scala
@@ -112,12 +112,12 @@ class L2PurityAnalysis private[analyses] (val project: SomeProject) extends Abst
      * @param code The code of the currently analyzed method
      */
     class State(
-            val method:    Method,
-            val context:   Context,
-            val declClass: ObjectType,
-            var tac:       TACode[TACMethodParameter, V] = null,
-            var lbPurity:  Purity                        = CompileTimePure,
-            var ubPurity:  Purity                        = CompileTimePure
+        val method:    Method,
+        val context:   Context,
+        val declClass: ObjectType,
+        var tac:       TACode[TACMethodParameter, V] = null,
+        var lbPurity:  Purity                        = CompileTimePure,
+        var ubPurity:  Purity                        = CompileTimePure
     ) extends AnalysisState {
 
         var fieldLocalityDependees: Map[Field, (EOptionP[Field, FieldLocality], Set[(Expr[V], Purity)])] = Map.empty
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/properties/TACAI.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/properties/TACAI.scala
index 809f7dd384..85d868af8a 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/properties/TACAI.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/properties/TACAI.scala
@@ -50,7 +50,7 @@ case object NoTACAI extends TACAI {
 }
 
 case class TheTACAI(
-        theTAC: TACode[TACMethodParameter, DUVar[ValueInformation]]
+    theTAC: TACode[TACMethodParameter, DUVar[ValueInformation]]
 ) extends TACAI {
     def tac: Option[TACode[TACMethodParameter, DUVar[ValueInformation]]] = Some(theTAC)
 }
diff --git a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/properties/Taint.scala b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/properties/Taint.scala
index 9a746e5c98..400f88b5b8 100644
--- a/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/properties/Taint.scala
+++ b/OPAL/tac/src/main/scala/org/opalj/tac/fpcf/properties/Taint.scala
@@ -19,8 +19,8 @@ import org.opalj.tac.fpcf.analyses.ifds.taint.TaintFact
  * @author Marc Clement
  */
 case class Taint(
-        flows:     Map[JavaStatement, Set[TaintFact]],
-        debugData: Map[JavaStatement, Set[TaintFact]] = Map.empty
+    flows:     Map[JavaStatement, Set[TaintFact]],
+    debugData: Map[JavaStatement, Set[TaintFact]] = Map.empty
 ) extends IFDSProperty[JavaStatement, TaintFact] {
 
     override type Self = Taint
diff --git a/TOOLS/hermes/src/main/scala/org/opalj/hermes/DuplicateFeatureIDException.scala b/TOOLS/hermes/src/main/scala/org/opalj/hermes/DuplicateFeatureIDException.scala
index 69f2fae5fd..c2c87d14bd 100644
--- a/TOOLS/hermes/src/main/scala/org/opalj/hermes/DuplicateFeatureIDException.scala
+++ b/TOOLS/hermes/src/main/scala/org/opalj/hermes/DuplicateFeatureIDException.scala
@@ -10,7 +10,7 @@ package hermes
  *         the given name.
  */
 case class DuplicateFeatureIDException(
-        featureID:     String,
-        featureQueryA: FeatureQuery,
-        featureQueryB: FeatureQuery
+    featureID:     String,
+    featureQueryA: FeatureQuery,
+    featureQueryB: FeatureQuery
 ) extends Exception(s"$featureID is derived by ${featureQueryA.id} and by ${featureQueryB.id}")
diff --git a/TOOLS/hermes/src/main/scala/org/opalj/hermes/Feature.scala b/TOOLS/hermes/src/main/scala/org/opalj/hermes/Feature.scala
index 5277d16688..cbf3c105be 100644
--- a/TOOLS/hermes/src/main/scala/org/opalj/hermes/Feature.scala
+++ b/TOOLS/hermes/src/main/scala/org/opalj/hermes/Feature.scala
@@ -17,9 +17,9 @@ package hermes
  * @author Michael Eichberg
  */
 abstract case class Feature[S] private (
-        id:         String,
-        count:      Int,
-        extensions: List[Location[S]]
+    id:         String,
+    count:      Int,
+    extensions: List[Location[S]]
 ) {
     assert(count >= extensions.size)
 }
diff --git a/TOOLS/hermes/src/main/scala/org/opalj/hermes/FeatureQuery.scala b/TOOLS/hermes/src/main/scala/org/opalj/hermes/FeatureQuery.scala
index 175ca73a1a..33533fef37 100644
--- a/TOOLS/hermes/src/main/scala/org/opalj/hermes/FeatureQuery.scala
+++ b/TOOLS/hermes/src/main/scala/org/opalj/hermes/FeatureQuery.scala
@@ -110,7 +110,7 @@ abstract class FeatureQuery(implicit hermes: HermesConfig) {
 }
 
 abstract class DefaultFeatureQuery(
-        implicit hermes: HermesConfig
+    implicit hermes: HermesConfig
 ) extends FeatureQuery {
 
     def evaluate[S](
@@ -132,7 +132,7 @@ abstract class DefaultFeatureQuery(
 }
 
 abstract class DefaultGroupedFeaturesQuery(
-        implicit hermes: HermesConfig
+    implicit hermes: HermesConfig
 ) extends DefaultFeatureQuery {
 
     def groupedFeatureIDs: Seq[Seq[String]]
diff --git a/TOOLS/hermes/src/main/scala/org/opalj/hermes/Location.scala b/TOOLS/hermes/src/main/scala/org/opalj/hermes/Location.scala
index 92d4bdfd98..19896c4b10 100644
--- a/TOOLS/hermes/src/main/scala/org/opalj/hermes/Location.scala
+++ b/TOOLS/hermes/src/main/scala/org/opalj/hermes/Location.scala
@@ -29,8 +29,8 @@ sealed abstract class Location[S] {
 }
 
 final case class PackageLocation[S](
-        override val source: Option[S],
-        packageName:         String
+    override val source: Option[S],
+    packageName:         String
 ) extends Location[S] {
 
     override def toString: String = {
@@ -53,8 +53,8 @@ object PackageLocation {
 }
 
 final case class ClassFileLocation[S](
-        override val source: Option[S],
-        classFileFQN:        String
+    override val source: Option[S],
+    classFileFQN:        String
 ) extends Location[S] {
 
     override def toString: String = {
@@ -91,9 +91,9 @@ object ClassFileLocation {
 }
 
 final case class FieldLocation[S](
-        classFileLocation: ClassFileLocation[S],
-        fieldName:         String,
-        fieldType:         FieldType
+    classFileLocation: ClassFileLocation[S],
+    fieldName:         String,
+    fieldType:         FieldType
 ) extends Location[S] {
 
     override def source: Option[S] = classFileLocation.source
@@ -119,9 +119,9 @@ object FieldLocation {
 }
 
 final case class MethodLocation[S](
-        classFileLocation: ClassFileLocation[S],
-        methodName:        String,
-        methodDescriptor:  MethodDescriptor
+    classFileLocation: ClassFileLocation[S],
+    methodName:        String,
+    methodDescriptor:  MethodDescriptor
 ) extends Location[S] {
 
     override def source: Option[S] = classFileLocation.source
diff --git a/TOOLS/hermes/src/main/scala/org/opalj/hermes/ProjectConfiguration.scala b/TOOLS/hermes/src/main/scala/org/opalj/hermes/ProjectConfiguration.scala
index 92ff4bd212..6d5843204f 100644
--- a/TOOLS/hermes/src/main/scala/org/opalj/hermes/ProjectConfiguration.scala
+++ b/TOOLS/hermes/src/main/scala/org/opalj/hermes/ProjectConfiguration.scala
@@ -24,10 +24,10 @@ import org.opalj.log.OPALLogger.info
  * @author Michael Eichberg
  */
 case class ProjectConfiguration(
-        id:             String,
-        cp:             String,
-        libcp:          Option[String],
-        libcp_defaults: Option[String]
+    id:             String,
+    cp:             String,
+    libcp:          Option[String],
+    libcp_defaults: Option[String]
 ) {
 
     @volatile private[this] var theProjectStatistics: immutable.Map[String, Double] = immutable.Map.empty
diff --git a/TOOLS/hermes/src/main/scala/org/opalj/hermes/ProjectFeatures.scala b/TOOLS/hermes/src/main/scala/org/opalj/hermes/ProjectFeatures.scala
index 9a71689ae6..b27770efbf 100644
--- a/TOOLS/hermes/src/main/scala/org/opalj/hermes/ProjectFeatures.scala
+++ b/TOOLS/hermes/src/main/scala/org/opalj/hermes/ProjectFeatures.scala
@@ -12,8 +12,8 @@ import javafx.beans.property.StringProperty
  * @author Michael Eichberg
  */
 case class ProjectFeatures[S](
-        projectConfiguration: ProjectConfiguration,
-        featureGroups:        Seq[(FeatureQuery, Seq[ObjectProperty[Feature[S]]])]
+    projectConfiguration: ProjectConfiguration,
+    featureGroups:        Seq[(FeatureQuery, Seq[ObjectProperty[Feature[S]]])]
 ) {
 
     /** The project's unique id. */
diff --git a/TOOLS/hermes/src/main/scala/org/opalj/hermes/ProjectInstantiation.scala b/TOOLS/hermes/src/main/scala/org/opalj/hermes/ProjectInstantiation.scala
index 3c71318c60..9714fc9dfb 100644
--- a/TOOLS/hermes/src/main/scala/org/opalj/hermes/ProjectInstantiation.scala
+++ b/TOOLS/hermes/src/main/scala/org/opalj/hermes/ProjectInstantiation.scala
@@ -13,6 +13,6 @@ import org.opalj.da
  * @author Michael Eichberg
  */
 case class ProjectInstantiation(
-        project:       Project[URL],
-        rawClassFiles: Iterable[(da.ClassFile, URL)]
+    project:       Project[URL],
+    rawClassFiles: Iterable[(da.ClassFile, URL)]
 )
diff --git a/TOOLS/hermes/src/main/scala/org/opalj/hermes/queries/FanInFanOut.scala b/TOOLS/hermes/src/main/scala/org/opalj/hermes/queries/FanInFanOut.scala
index 740c1856c3..7c44c70714 100644
--- a/TOOLS/hermes/src/main/scala/org/opalj/hermes/queries/FanInFanOut.scala
+++ b/TOOLS/hermes/src/main/scala/org/opalj/hermes/queries/FanInFanOut.scala
@@ -42,10 +42,10 @@ class FanInFanOut(implicit hermes: HermesConfig) extends FeatureQuery {
     ///// ###############################################################
 
     case class FeatureConfiguration(
-            featureName:   String,
-            numCategories: Int,
-            categorySize:  Double,
-            offset:        Int
+        featureName:   String,
+        numCategories: Int,
+        categorySize:  Double,
+        offset:        Int
     ) {
 
         private[this] lazy val _maxFeatureIndex = numCategories - 1
diff --git a/TOOLS/hermes/src/main/scala/org/opalj/hermes/queries/jcg/Java8Invokedynamics.scala b/TOOLS/hermes/src/main/scala/org/opalj/hermes/queries/jcg/Java8Invokedynamics.scala
index 88ec2cfda7..9fd600c3ef 100644
--- a/TOOLS/hermes/src/main/scala/org/opalj/hermes/queries/jcg/Java8Invokedynamics.scala
+++ b/TOOLS/hermes/src/main/scala/org/opalj/hermes/queries/jcg/Java8Invokedynamics.scala
@@ -37,7 +37,7 @@ import org.opalj.da
  * @author Michael Reif
  */
 class Java8Invokedynamics(
-        implicit val hermesConfig: HermesConfig
+    implicit val hermesConfig: HermesConfig
 ) extends DefaultFeatureQuery {
 
     override def featureIDs: Seq[String] =
diff --git a/TOOLS/hermes/src/main/scala/org/opalj/hermes/queries/util/APIFeature.scala b/TOOLS/hermes/src/main/scala/org/opalj/hermes/queries/util/APIFeature.scala
index b11119cb4c..bb6aec2e8c 100644
--- a/TOOLS/hermes/src/main/scala/org/opalj/hermes/queries/util/APIFeature.scala
+++ b/TOOLS/hermes/src/main/scala/org/opalj/hermes/queries/util/APIFeature.scala
@@ -87,10 +87,10 @@ sealed abstract class APIMethod(private val fID: Option[String] = None) extends
  *         all methods with the same name, declared in the same class.
  */
 case class InstanceAPIMethod(
-        declClass:  ObjectType,
-        name:       String,
-        descriptor: Option[MethodDescriptor],
-        fID:        Option[String] = None
+    declClass:  ObjectType,
+    name:       String,
+    descriptor: Option[MethodDescriptor],
+    fID:        Option[String] = None
 ) extends APIMethod(fID) {
 
     def unapply(i: MethodInvocationInstruction): Boolean = {
@@ -139,10 +139,10 @@ object InstanceAPIMethod {
  *         all methods with the same name, declared in the same class.
  */
 case class StaticAPIMethod(
-        declClass:  ObjectType,
-        name:       String,
-        descriptor: Option[MethodDescriptor],
-        fID:        Option[String] = None
+    declClass:  ObjectType,
+    name:       String,
+    descriptor: Option[MethodDescriptor],
+    fID:        Option[String] = None
 ) extends APIMethod(fID) {
 
     def unapply(i: MethodInvocationInstruction): Boolean = {

From 4ebbb8f95c474e61ae910f83ad88ca4dfbd2820b Mon Sep 17 00:00:00 2001
From: Dominik Helm <helm@cs.tu-darmstadt.de>
Date: Fri, 26 Jan 2024 17:41:17 +0100
Subject: [PATCH 5/6] More thorough update of formatting preferences

---
 Eclipse Java Formatter Preferences.xml        | 671 ++++++++++--------
 ...J Java and Scala Formatter Preferences.xml |  54 +-
 2 files changed, 422 insertions(+), 303 deletions(-)

diff --git a/Eclipse Java Formatter Preferences.xml b/Eclipse Java Formatter Preferences.xml
index 3618e2b857..666f60fb08 100644
--- a/Eclipse Java Formatter Preferences.xml	
+++ b/Eclipse Java Formatter Preferences.xml	
@@ -1,291 +1,380 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="12">
-<profile kind="CodeFormatterProfile" name="Java Conventions [maximum line width 120]" version="12">
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="90"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="90"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-</profile>
-</profiles>
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles version="21">
+	<profile kind="CodeFormatterProfile" name="Project" version="21">
+		<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+		<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+		<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+		<setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_constructor" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="preserve_positions"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="preserve_positions"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="preserve_positions"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration" value="preserve_positions"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="preserve_positions"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="preserve_positions"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="preserve_positions"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="preserve_positions"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="preserve_positions"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="preserve_positions"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="preserve_positions"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
+		<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
+		<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+		<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+		<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="18"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="48"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="2"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="18"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_assertion_message" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="49"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="49"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="49"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="49"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_annotations" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+		<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+	</profile>
+</profiles>
\ No newline at end of file
diff --git a/IntelliJ Java and Scala Formatter Preferences.xml b/IntelliJ Java and Scala Formatter Preferences.xml
index 6afedd35a8..e72bd1f1a2 100644
--- a/IntelliJ Java and Scala Formatter Preferences.xml	
+++ b/IntelliJ Java and Scala Formatter Preferences.xml	
@@ -1,11 +1,12 @@
-<code_scheme name="Java Conventions [maximum line width 120]" version="173">
+<code_scheme name="Project" version="173">
   <option name="RIGHT_MARGIN" value="120" />
   <option name="FORMATTER_TAGS_ENABLED" value="true" />
+  <option name="SOFT_MARGINS" value="120" />
   <JavaCodeStyleSettings>
     <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
   </JavaCodeStyleSettings>
   <ScalaCodeStyleSettings>
-    <option name="classCountToUseImportOnDemand" value="32" />
+    <option name="classCountToUseImportOnDemand" value="60" />
     <option name="collectImports" value="false" />
     <option name="doNotChangeLocalImportsOnOptimize" value="false" />
     <option name="importLayout">
@@ -15,8 +16,8 @@
         <option value="scala.reflect" />
         <option value="_______ blank line _______" />
         <option value="java" />
-        <option value="_______ blank line _______" />
         <option value="scala" />
+        <option value="play" />
         <option value="_______ blank line _______" />
         <option value="org.junit" />
         <option value="org.scalacheck" />
@@ -27,8 +28,6 @@
         <option value="_______ blank line _______" />
         <option value="org.opalj" />
         <option value="_______ blank line _______" />
-        <option value="scala.collection.parallel.CollectionConverters" />
-        <option value="_______ blank line _______" />
         <option value="all other imports" />
       </array>
     </option>
@@ -81,18 +80,35 @@
         <option value="scala.reflect.macros.whitebox.Context" />
       </array>
     </option>
-    <option name="sortAsScalastyle" value="true" />
-    <option name="USE_SCALADOC2_FORMATTING" value="false" />
+    <option name="WRAP_BEFORE_WITH_KEYWORD" value="true" />
+    <option name="PLACE_SELF_TYPE_ON_NEW_LINE" value="false" />
+    <option name="ALIGN_EXTENDS_WITH" value="3" />
+    <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
+    <option name="ALIGN_COMPOSITE_PATTERN" value="false" />
+    <option name="INDENT_FIRST_PARAMETER" value="false" />
+    <option name="SCALAFMT_CONFIG_PATH" value="/home/dominik/Work/opal/.scalafmt.conf" />
+    <option name="SCALAFMT_REFORMAT_ON_FILES_SAVE" value="true" />
+    <option name="FORMATTER" value="1" />
+    <option name="SPACE_AFTER_MODIFIERS_CONSTRUCTOR" value="true" />
+    <option name="SPACES_IN_ONE_LINE_BLOCKS" value="true" />
+    <option name="SPACES_AROUND_AT_IN_PATTERNS" value="true" />
+    <option name="ALIGN_PARAMETER_TYPES_IN_MULTILINE_DECLARATIONS" value="2" />
+    <option name="SPACE_BEFORE_TYPE_PARAMETER_LEADING_CONTEXT_BOUND_COLON_HK" value="false" />
+    <option name="CALL_PARAMETERS_NEW_LINE_AFTER_LPAREN" value="2" />
+    <option name="MULTILINE_STRING_ALIGN_DANGLING_CLOSING_QUOTES" value="true" />
     <option name="TYPE_ANNOTATION_EXCLUDE_MEMBER_OF_ANONYMOUS_CLASS" value="true" />
     <option name="TYPE_ANNOTATION_EXCLUDE_MEMBER_OF_PRIVATE_CLASS" value="true" />
     <option name="SD_BLANK_LINE_AFTER_PARAMETERS_COMMENTS" value="true" />
     <option name="SD_BLANK_LINE_AFTER_RETURN_COMMENTS" value="true" />
+    <option name="SD_BLANK_LINE_BEFORE_PARAMETERS" value="true" />
     <option name="SD_KEEP_BLANK_LINES_BETWEEN_TAGS" value="true" />
     <option name="SD_PRESERVE_SPACES_IN_TAGS" value="true" />
-    <!-- Unicode arrows are not supported anymore since Scala 2.13 -->
-    <option name="REPLACE_CASE_ARROW_WITH_UNICODE_CHAR" value="false" />
-    <option name="REPLACE_MAP_ARROW_WITH_UNICODE_CHAR" value="false" />
-    <option name="REPLACE_FOR_GENERATOR_ARROW_WITH_UNICODE_CHAR" value="false" />
+    <option name="TRAILING_COMMA_MODE" value="TRAILING_COMMA_REMOVE_WHEN_MULTILINE" />
+    <option name="TRAILING_COMMA_TUPLE_ENABLED" value="true" />
+    <option name="TRAILING_COMMA_TUPLE_TYPE_ENABLED" value="true" />
+    <option name="TRAILING_COMMA_PATTERN_ARG_LIST_ENABLED" value="true" />
+    <option name="TRAILING_COMMA_TYPE_PARAMS_ENABLED" value="true" />
+    <option name="TRAILING_COMMA_IMPORT_SELECTOR_ENABLED" value="true" />
   </ScalaCodeStyleSettings>
   <codeStyleSettings language="JAVA">
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
@@ -132,7 +148,21 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="Scala">
-    <option name="MODIFIER_LIST_WRAP" value="true" />
+    <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+    <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+    <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+    <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+    <option name="CALL_PARAMETERS_WRAP" value="5" />
+    <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+    <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+    <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+    <option name="EXTENDS_LIST_WRAP" value="5" />
+    <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+    <option name="BINARY_OPERATION_WRAP" value="1" />
+    <option name="FOR_STATEMENT_WRAP" value="2" />
+    <option name="VARIABLE_ANNOTATION_WRAP" value="2" />
+    <option name="SOFT_MARGINS" value="120" />
     <indentOptions>
       <option name="INDENT_SIZE" value="4" />
       <option name="CONTINUATION_INDENT_SIZE" value="4" />

From 7f21e49b137cda287254e248acdd5dec5d4d9456 Mon Sep 17 00:00:00 2001
From: Dominik Helm <helm@cs.tu-darmstadt.de>
Date: Fri, 26 Jan 2024 11:42:54 +0100
Subject: [PATCH 6/6] Remove sbt option required only for old Scalariform

---
 project/libraries.sbt | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/project/libraries.sbt b/project/libraries.sbt
index 5aca9ae24c..4db774257d 100644
--- a/project/libraries.sbt
+++ b/project/libraries.sbt
@@ -2,15 +2,10 @@
 // THE VERSION OF THIS LIBRARY MUST NOT BE UPDATED - WE RELY ON THE JAVA CLASS FILE'S INTERNALS!
 libraryDependencies += "org.eclipse.jdt" % "ecj" % "3.28.0.v20211021-2009" // <= DO *NOT* CHANGE!
 
-//TODO Remove once scalariform is gone
-ThisBuild / libraryDependencySchemes ++= Seq(
-    "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
-)
-
 // Required to compile the website
 libraryDependencies += "com.typesafe.play" %% "twirl-api" % "1.6.2"
 libraryDependencies += "com.typesafe.play" %% "twirl-compiler" % "1.6.2"
 libraryDependencies += "org.scala-lang" % "scala-compiler" % sbt.Keys.scalaVersion.value
 
-libraryDependencies += "com.vladsch.flexmark" % "flexmark-all"  % "0.62.2"
-libraryDependencies += "com.typesafe"         % "config"        % "1.4.1"
+libraryDependencies += "com.vladsch.flexmark" % "flexmark-all" % "0.62.2"
+libraryDependencies += "com.typesafe" % "config" % "1.4.1"