diff --git a/hppcrt-benchmarks/pom.xml b/hppcrt-benchmarks/pom.xml
index 556829b05..10eb51dec 100644
--- a/hppcrt-benchmarks/pom.xml
+++ b/hppcrt-benchmarks/pom.xml
@@ -20,9 +20,8 @@
     <properties>  
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmh.version>1.11.3</jmh.version>
-        <javac.target>1.7</javac.target>
         <uberjar.name>benchmarks</uberjar.name>
-        
+
         <hppc.version>0.7.1</hppc.version>
         <fastutil.version>7.0.9</fastutil.version>
         <eclipse.collections.version>7.0.0</eclipse.collections.version>
@@ -32,17 +31,17 @@
 
     <!-- Dependencies. -->
     <dependencies>
-       
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${version.junit}</version>
         </dependency>
-        
+
         <dependency>
-          <groupId>com.carrotsearch.randomizedtesting</groupId>
-          <artifactId>randomizedtesting-runner</artifactId>
-          <version>${version.randomizedtesting}</version>
+            <groupId>com.carrotsearch.randomizedtesting</groupId>
+            <artifactId>randomizedtesting-runner</artifactId>
+            <version>${version.randomizedtesting}</version>
         </dependency>
 
         <dependency>
@@ -50,7 +49,7 @@
             <artifactId>jmh-core</artifactId>
             <version>${jmh.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
@@ -64,7 +63,7 @@
             <artifactId>hppcrt</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
         <!-- Original HPPC -->
         <dependency>
             <groupId>com.carrotsearch</groupId>
@@ -78,8 +77,8 @@
             <artifactId>fastutil</artifactId>
             <version>${fastutil.version}</version>
         </dependency>
-        
-         <!-- Koloboke -->
+
+        <!-- Koloboke -->
         <dependency>
             <groupId>net.openhft</groupId>
             <artifactId>koloboke-api-jdk8</artifactId>
@@ -94,23 +93,23 @@
 
         <!-- Eclipse Collections, formerly Goldman Sachs collections -->
         <dependency>
-        	<groupId>org.eclipse.collections</groupId>
-        	<artifactId>eclipse-collections-api</artifactId>
-        	<version>${eclipse.collections.version}</version>
+            <groupId>org.eclipse.collections</groupId>
+            <artifactId>eclipse-collections-api</artifactId>
+            <version>${eclipse.collections.version}</version>
         </dependency>
         <dependency>
-        	<groupId>org.eclipse.collections</groupId>
-        	<artifactId>eclipse-collections</artifactId>
-        	<version>${eclipse.collections.version}</version>
+            <groupId>org.eclipse.collections</groupId>
+            <artifactId>eclipse-collections</artifactId>
+            <version>${eclipse.collections.version}</version>
         </dependency>
-        
+
         <!-- Javolution -->
         <dependency>
             <groupId>org.javolution</groupId>
             <artifactId>javolution-core-java</artifactId>
             <version>${javolution.version}</version>
         </dependency>
-     
+
     </dependencies>
 
     <!-- Build tuning. -->
@@ -134,16 +133,16 @@
                                     <mainClass>org.openjdk.jmh.Main</mainClass>
                                 </transformer>
                             </transformers>
-                             <filters>
-                             <filter>
-                              <artifact>*:*</artifact>
-                              <excludes>
-                                <exclude>META-INF/*.SF</exclude>
-                                <exclude>META-INF/*.DSA</exclude>
-                                <exclude>META-INF/*.RSA</exclude>
-                              </excludes>
-                            </filter>
-                          </filters>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/hppcrt-template-processor/pom.xml b/hppcrt-template-processor/pom.xml
index 4ff1ac9b6..ae7a0e094 100644
--- a/hppcrt-template-processor/pom.xml
+++ b/hppcrt-template-processor/pom.xml
@@ -1,78 +1,77 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <parent>
+    <parent>
+        <groupId>com.github.vsonnier</groupId>
+        <artifactId>hppcrt-parent</artifactId>
+        <version>0.7.3-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <!-- Project info. -->
     <groupId>com.github.vsonnier</groupId>
-    <artifactId>hppcrt-parent</artifactId>
+    <artifactId>hppcrt-template-processor</artifactId>
     <version>0.7.3-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
+    <packaging>jar</packaging>
+
+    <name>HPPC-RT Template Processor</name>
+    <description>Template Processor and Code Generation for HPPC-RT.</description>
+
+    <properties>
+        <version.velocity>1.7</version.velocity>
+    </properties>
 
-  <!-- Project info. -->
-  <groupId>com.github.vsonnier</groupId>
-  <artifactId>hppcrt-template-processor</artifactId>
-  <version>0.7.3-SNAPSHOT</version>
-  <packaging>jar</packaging>
+    <!-- Dependencies. -->
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${version.guava}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4</artifactId>
+            <version>${version.antlr}</version>
+        </dependency>
 
-  <name>HPPC-RT Template Processor</name>
-  <description>Template Processor and Code Generation for HPPC-RT.</description>
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>${version.velocity}</version>
+        </dependency>
 
-  <properties>
-    <version.velocity>1.7</version.velocity>
-  </properties>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${version.junit}</version>
+        </dependency>
 
-  <!-- Dependencies. -->
-  <dependencies>
-  <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>${version.guava}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4</artifactId>
-      <version>${version.antlr}</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity</artifactId>
-      <version>${version.velocity}</version>
-    </dependency>
-    
-    <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${version.junit}</version>
-    </dependency>
-        
-    <dependency>
-      <groupId>com.carrotsearch.randomizedtesting</groupId>
-      <artifactId>randomizedtesting-runner</artifactId>
-      <version>${version.randomizedtesting}</version>
-    </dependency>
-    
-  </dependencies>
+        <dependency>
+            <groupId>com.carrotsearch.randomizedtesting</groupId>
+            <artifactId>randomizedtesting-runner</artifactId>
+            <version>${version.randomizedtesting}</version>
+        </dependency>
+    </dependencies>
 
-  <!-- Build tuning, run ANTLRv4 to build from grammar -->
-  <build>
+    <!-- Build tuning, run ANTLRv4 to build from grammar -->
+    <build>
         <plugins>  
             <plugin>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-maven-plugin</artifactId>
                 <executions>
-                  <execution>
-                    <id>antlr4</id>
-                    <goals>
-                      <goal>antlr4</goal>
-                    </goals>
-                    <configuration>
-                      <visitor>true</visitor>
-                    </configuration>
-                  </execution>
+                    <execution>
+                        <id>antlr4</id>
+                        <goals>
+                            <goal>antlr4</goal>
+                        </goals>
+                        <configuration>
+                            <visitor>true</visitor>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
-  </build>
+    </build>
 </project>
diff --git a/hppcrt/pom.xml b/hppcrt/pom.xml
index f11bd5fbf..f5e043fe0 100644
--- a/hppcrt/pom.xml
+++ b/hppcrt/pom.xml
@@ -1,235 +1,235 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>com.github.vsonnier</groupId>
-		<artifactId>hppcrt-parent</artifactId>
-		<version>0.7.3-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+    <parent>
+        <groupId>com.github.vsonnier</groupId>
+        <artifactId>hppcrt-parent</artifactId>
+        <version>0.7.3-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-	<!-- Project info. -->
-	<groupId>com.github.vsonnier</groupId>
-	<artifactId>hppcrt</artifactId>
-	<version>0.7.3-SNAPSHOT</version>
-	<packaging>bundle</packaging>
+    <!-- Project info. -->
+    <groupId>com.github.vsonnier</groupId>
+    <artifactId>hppcrt</artifactId>
+    <version>0.7.3-SNAPSHOT</version>
+    <packaging>bundle</packaging>
 
-	<name>HPPC-RT Collections</name>
-	<description>High Performance Primitive Collections Realtime
+    <name>HPPC-RT Collections</name>
+    <description>High Performance Primitive Collections Realtime
  (fork of HPPC from Carrotsearch)
   Fundamental data structures (maps, sets, lists, queues, heaps, sorts) generated for
   combinations of object and primitive types to conserve JVM memory and speed
   up execution. The Realtime fork intends to extend the existing collections, by tweaking to remove any dynamic allocations at runtime,
   and to obtain low variance execution times whatever the input nature. 
-	</description>
-	
-	<!-- Dependencies. -->
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${version.junit}</version>
-			<scope>test</scope>
-		</dependency>
+    </description>
 
-		<dependency>
-			<groupId>com.carrotsearch.randomizedtesting</groupId>
-			<artifactId>randomizedtesting-runner</artifactId>
-			<version>${version.randomizedtesting}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	
-	<!-- Build tuning. -->
-	<build>
-		<defaultGoal>install</defaultGoal>
-		<plugins>
-			<!-- Generate sources for primitives from template. -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate.sources</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<fork>true</fork>
-							<meminitial>256m</meminitial>
-							<maxmem>512m</maxmem>
-							<target>
+    <!-- Dependencies. -->
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${version.junit}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.carrotsearch.randomizedtesting</groupId>
+            <artifactId>randomizedtesting-runner</artifactId>
+            <version>${version.randomizedtesting}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <!-- Build tuning. -->
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <plugins>
+            <!-- Generate sources for objects/primitives from template. -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate.sources</id>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <fork>true</fork>
+                            <meminitial>256m</meminitial>
+                            <maxmem>512m</maxmem>
+                            <target>
                                 <!-- Pass the full plugin classpath to the Ant script through the Ant property template_prcessor_classpath -->
                                 <!-- so that TemplateProcessor could find all the classes it needs -->
-								<property name="template_prcessor_classpath" refid="maven.plugin.classpath" />
-								<ant antfile="${basedir}/build.xml" />
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>com.github.vsonnier</groupId>
-						<artifactId>hppcrt-template-processor</artifactId>
-						<version>${project.version}</version>
-					</dependency>
+                                <property name="template_prcessor_classpath" refid="maven.plugin.classpath" />
+                                <ant antfile="${basedir}/build.xml" />
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.github.vsonnier</groupId>
+                        <artifactId>hppcrt-template-processor</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
                     <!-- force AntRun to use the specified Ant -->
                     <dependency>
-						<groupId>org.apache.ant</groupId>
+                        <groupId>org.apache.ant</groupId>
                         <artifactId>ant</artifactId>
                         <version>${version.ant}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-           
-			<!-- Add generated source locations. -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${project.basedir}/src/main/templates</source>
-								<source>${project.build.directory}/generated-sources/main/java</source>
-							</sources>
-						</configuration>
-					</execution>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <!-- Add generated source locations. -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.basedir}/src/main/templates</source>
+                                <source>${project.build.directory}/generated-sources/main/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
 
-					<execution>
-						<id>add-test-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${project.basedir}/src/test/templates</source>
-								<source>${project.build.directory}/generated-sources/test/java</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.basedir}/src/test/templates</source>
+                                <source>${project.build.directory}/generated-sources/test/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-            
-             <!-- Use Retrolamda to translate source classes only (not tests classes) into lib.bytecode.level bytecode -->
-                <plugin>
-                    <groupId>net.orfjackal.retrolambda</groupId>
-                    <artifactId>retrolambda-maven-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>retrolambda-classes</id>
-                            <phase>process-classes</phase>
-                            <goals>
-                                <goal>process-main</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                     <configuration>
-                        <target>${lib.bytecode.level}</target>
-                        <defaultMethods>false</defaultMethods>
-                    </configuration>
-                </plugin>
-			
-			<!-- Project in general is Java 8 level while the final lib is still JDK 1.5 on api side. -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>animal-sniffer-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>check-java-api</id>
-						<phase>test</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<configuration>
-							<signature>
-								<groupId>org.codehaus.mojo.signature
-								</groupId>
-								<artifactId>${lib.jdk.level}</artifactId>
-								<version>1.0</version>
-							</signature>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+            <!-- Use Retrolamda to translate source classes only (not tests classes) into lib.bytecode.level bytecode -->
+            <plugin>
+                <groupId>net.orfjackal.retrolambda</groupId>
+                <artifactId>retrolambda-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>retrolambda-classes</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>process-main</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <target>${lib.bytecode.level}</target>
+                    <defaultMethods>false</defaultMethods>
+                </configuration>
+            </plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<configuration>
-							<encoding>${project.build.sourceEncoding}</encoding>
-							<windowtitle>HPPC-RT v${project.version} API Documentation</windowtitle>
-							<doctitle>HPPC-RT v${project.version} API Documentation</doctitle>
-							<header><![CDATA[<div id='header'><a class='logo' target='_top' href='https://github.com/vsonnier/hppcrt'></a>High Performance Primitive Collections Realtime(HPPC-RT) v${project.version} <br>API Documentation</div>]]></header>
-							<failOnError>false</failOnError>
-							<docfilessubdirs>true</docfilessubdirs>
-							<use>false</use>
-							<noindex>false</noindex>
-							<notree>false</notree>
-							<groups>
-								<group>
-									<title>HPPC-RT</title>
-									<packages>com.carrotsearch.hppcrt*</packages>
-								</group>
-							</groups>
-						</configuration>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+            <!-- Project in general is Java 8 level while the final lib is still JDK 1.5 on api side. -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>animal-sniffer-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>check-java-api</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <signature>
+                                <groupId>org.codehaus.mojo.signature
+                                </groupId>
+                                <artifactId>${lib.jdk.level}</artifactId>
+                                <version>1.0</version>
+                            </signature>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
-			<!-- Run tests with Randomizedtesting, instead of Surefire, but create a similar output -->
-			<plugin>
-				<groupId>com.carrotsearch.randomizedtesting</groupId>
-				<artifactId>junit4-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>junit4-tests</id>
-						<goals>
-							<goal>junit4</goal>
-						</goals>
-						<configuration>
-							<includes>
-								<include>**/*Test.*</include>
-							</includes>
-							<excludes>
-								<exclude>**/*$*</exclude>
-								<exclude>**/Abstract*</exclude>
-							</excludes>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <configuration>
+                            <encoding>${project.build.sourceEncoding}</encoding>
+                            <windowtitle>HPPC-RT v${project.version} API Documentation</windowtitle>
+                            <doctitle>HPPC-RT v${project.version} API Documentation</doctitle>
+                            <header>
+                                <![CDATA[<div id='header'><a class='logo' target='_top' href='https://github.com/vsonnier/hppcrt'></a>High Performance Primitive Collections Realtime(HPPC-RT) v${project.version} <br>API Documentation</div>]]>
+                            </header>
+                            <failOnError>false</failOnError>
+                            <docfilessubdirs>true</docfilessubdirs>
+                            <use>false</use>
+                            <noindex>false</noindex>
+                            <notree>false</notree>
+                            <groups>
+                                <group>
+                                    <title>HPPC-RT</title>
+                                    <packages>com.carrotsearch.hppcrt*</packages>
+                                </group>
+                            </groups>
+                        </configuration>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 
-							<parallelism>auto</parallelism>
-							<maxMemory>512m</maxMemory>
+            <!-- Run tests with Randomizedtesting, instead of Surefire, but create a similar output -->
+            <plugin>
+                <groupId>com.carrotsearch.randomizedtesting</groupId>
+                <artifactId>junit4-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>junit4-tests</id>
+                        <goals>
+                            <goal>junit4</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>**/*Test.*</include>
+                            </includes>
+                            <excludes>
+                                <exclude>**/*$*</exclude>
+                                <exclude>**/Abstract*</exclude>
+                            </excludes>
 
-							<!-- Attach a simple listener. -->
-							<listeners>
-								<report-text showThrowable="false" 
+                            <parallelism>auto</parallelism>
+                            <maxMemory>512m</maxMemory>
+
+                            <!-- Attach a simple listener. -->
+                            <listeners>
+                                <report-text showThrowable="false" 
 											 showStackTraces="false" 
 											 showOutput="onError"
 											 showStatusOk="false"
@@ -238,33 +238,32 @@
 											 showStatusIgnored="false"
 											 showSuiteSummary="true" />
 
-								<report-json file="${project.build.directory}/surefire-reports/test-results.html" />
-								<report-ant-xml dir="${project.build.directory}/surefire-reports/" mavenExtensions="true" />
-							</listeners>
-
-							<assertions>
-								<enable package="com.carrotsearch"/>
-							</assertions>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+                                <report-json file="${project.build.directory}/surefire-reports/test-results.html" />
+                                <report-ant-xml dir="${project.build.directory}/surefire-reports/" mavenExtensions="true" />
+                            </listeners>
 
-		</plugins>
-	</build>
-	<profiles>
-		<profile>
-			<id>quick</id>
-			<properties>
-				<skipTests>true</skipTests> 
-			</properties>
-		</profile>
+                            <assertions>
+                                <enable package="com.carrotsearch"/>
+                            </assertions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>quick</id>
+            <properties>
+                <skipTests>true</skipTests> 
+            </properties>
+        </profile>
         <profile>
-			<id>quicknodoc</id>
-			<properties>
-				<skipTests>true</skipTests>
+            <id>quicknodoc</id>
+            <properties>
+                <skipTests>true</skipTests>
                 <maven.javadoc.skip>true</maven.javadoc.skip>
-			</properties>
-		</profile>
-	</profiles>
+            </properties>
+        </profile>
+    </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 0dbdf6c0a..4a65cef5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,14 +32,14 @@
         <system>GitHub</system>
         <url>https://github.com/vsonnier/hppcrt/issues</url>
     </issueManagement>
-	
-	<mailingLists>
-     <mailingList>
-       <name>Announcements and bug reports mailing list</name>
-       <subscribe>java-high-performance-primitive-collections+subscribe@googlegroups.com</subscribe>
-       <unsubscribe>java-high-performance-primitive-collections+unsubscribe@googlegroups.com</unsubscribe>
-       <post>java-high-performance-primitive-collections@googlegroups.com</post>
-     </mailingList>
+
+    <mailingLists>
+        <mailingList>
+            <name>Announcements and bug reports mailing list</name>
+            <subscribe>java-high-performance-primitive-collections+subscribe@googlegroups.com</subscribe>
+            <unsubscribe>java-high-performance-primitive-collections+unsubscribe@googlegroups.com</unsubscribe>
+            <post>java-high-performance-primitive-collections@googlegroups.com</post>
+        </mailingList>
     </mailingLists>
 
     <scm>
@@ -60,52 +60,52 @@
     <!-- Global properties. -->
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        
+
         <!-- Because of Retrolambda, the project as a whole requires Java 8, while the final Jar is still Java 1.5 compatible -->
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-       
+
         <!-- Retrolambda will generate a 1.5 bytecode -->
         <lib.bytecode.level>1.5</lib.bytecode.level>
         <!-- Lib must only contain JDK 1.5 API, checked by animal-sniffer -->
         <lib.jdk.level>java15</lib.jdk.level>
-        
+
         <version.retrolambda>2.1.0</version.retrolambda>
-        
+
         <version.guava>19.0</version.guava>
 
         <version.junit>4.12</version.junit>
-         
+
         <version.maven-antrun-plugin>1.8</version.maven-antrun-plugin>
         <version.ant>1.9.6</version.ant>
-		
-		<version.antlr>4.5.1</version.antlr>
+
+        <version.antlr>4.5.1</version.antlr>
 
         <version.randomizedtesting>2.3.3</version.randomizedtesting>
-       
+
         <version.maven-clean-plugin>3.0.0</version.maven-clean-plugin>
         <version.maven-compiler-plugin>3.5</version.maven-compiler-plugin>
         <version.maven-dependency-plugin>2.10</version.maven-dependency-plugin>
         <version.maven-deploy-plugin>2.8.2</version.maven-deploy-plugin>
         <version.maven-eclipse-plugin>2.10</version.maven-eclipse-plugin>
-       
+
         <version.maven-install-plugin>2.5.2</version.maven-install-plugin>
         <version.maven-jar-plugin>2.6</version.maven-jar-plugin>
         <version.maven-shade-plugin>2.4.3</version.maven-shade-plugin>  
         <version.maven-resources-plugin>2.7</version.maven-resources-plugin>
         <version.maven-surefire-plugin>2.19.1</version.maven-surefire-plugin>
-        
+
         <version.maven-enforcer-plugin>1.4.1</version.maven-enforcer-plugin>
-		<version.maven-javadoc-plugin>2.10.3</version.maven-javadoc-plugin>
+        <version.maven-javadoc-plugin>2.10.3</version.maven-javadoc-plugin>
         <version.maven-source-plugin>2.4</version.maven-source-plugin>
-		
-		<version.build-helper-maven-plugin>1.10</version.build-helper-maven-plugin>
-		<version.animal-sniffer-maven-plugin>1.14</version.animal-sniffer-maven-plugin>
-         
+
+        <version.build-helper-maven-plugin>1.10</version.build-helper-maven-plugin>
+        <version.animal-sniffer-maven-plugin>1.14</version.animal-sniffer-maven-plugin>
+
         <version.maven-bundle-plugin>3.0.1</version.maven-bundle-plugin>
-		 
+
         <version.maven.api>3.3.3</version.maven.api>
-        
+
         <!-- Never deploy automatically -->
         <skip.deployment>true</skip.deployment>
     </properties>
@@ -169,11 +169,11 @@
                         <source>${maven.compiler.source}</source>
                         <target>${maven.compiler.target}</target>
                         <compilerArgs>
-                          <arg>-Xlint</arg>
+                            <arg>-Xlint</arg>
                         </compilerArgs>
                     </configuration>
                 </plugin>
-	
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-eclipse-plugin</artifactId>
@@ -205,26 +205,26 @@
                         </excludes>
                     </configuration>
                 </plugin>
-				
-				<plugin>
-				  <groupId>org.apache.maven.plugins</groupId>
-				  <artifactId>maven-javadoc-plugin</artifactId>
-				  <version>${version.maven-javadoc-plugin}</version>
-				  <configuration>
-					<detectJavaApiLink>false</detectJavaApiLink>
-					<detectLinks>false</detectLinks>
-					<detectOfflineLinks>false</detectOfflineLinks>
-					<quiet>false</quiet>
-					<show>protected</show>
-					<sourceFileExcludes>
-						<exclude>**/KType*</exclude>
-                        <exclude>**/*KType*</exclude>
-                        <exclude>**/VType*</exclude>
-                        <exclude>**/*VType*</exclude>
-                        <exclude>**/Intrinsics*</exclude>
-				  </sourceFileExcludes>
-				  </configuration>
-				</plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>${version.maven-javadoc-plugin}</version>
+                    <configuration>
+                        <detectJavaApiLink>false</detectJavaApiLink>
+                        <detectLinks>false</detectLinks>
+                        <detectOfflineLinks>false</detectOfflineLinks>
+                        <quiet>false</quiet>
+                        <show>protected</show>
+                        <sourceFileExcludes>
+                            <exclude>**/KType*</exclude>
+                            <exclude>**/*KType*</exclude>
+                            <exclude>**/VType*</exclude>
+                            <exclude>**/*VType*</exclude>
+                            <exclude>**/Intrinsics*</exclude>
+                        </sourceFileExcludes>
+                    </configuration>
+                </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -277,13 +277,13 @@
                     <artifactId>build-helper-maven-plugin</artifactId>
                     <version>${version.build-helper-maven-plugin}</version>
                 </plugin>
-				
-				 <plugin>
+
+                <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>animal-sniffer-maven-plugin</artifactId>
                     <version>${version.animal-sniffer-maven-plugin}</version>
                 </plugin>
-                
+
                 <!-- Use Retrolamda to translate source classes only (not tests classes) into lib.bytecode.level bytecode -->
                 <plugin>
                     <groupId>net.orfjackal.retrolambda</groupId>