diff --git a/src/main/java/pl/project13/jgit/DescribeResult.java b/src/main/java/pl/project13/jgit/DescribeResult.java
index 69b98991..23653ee0 100644
--- a/src/main/java/pl/project13/jgit/DescribeResult.java
+++ b/src/main/java/pl/project13/jgit/DescribeResult.java
@@ -223,11 +223,7 @@ private static Optional<AbbreviatedObjectId> createAbbreviatedCommitId(@Nonnull
 
   @Nullable
   public ObjectId commitObjectId() {
-    if (commitId.isPresent()) {
-      return commitId.get();
-    } else {
-      return null;
-    }
+    return commitId.orElse(null);
   }
 
   @Nullable
diff --git a/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java b/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java
index f612f7fe..a072dcaa 100644
--- a/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java
+++ b/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java
@@ -572,15 +572,8 @@ private void logProperties() {
     }
   }
 
-  private boolean isUseNativeGit() {
-    if (System.getProperty("maven.gitcommitid.nativegit") != null) {
-      return useNativeGitViaCommandLine;
-    }
-    return useNativeGit;
-  }
-
   private void loadGitData(@Nonnull Properties properties) throws GitCommitIdExecutionException {
-    if (isUseNativeGit()) {
+    if (useNativeGit || useNativeGitViaCommandLine) {
       loadGitDataWithNativeGit(properties);
     } else {
       loadGitDataWithJGit(properties);
diff --git a/src/main/java/pl/project13/maven/git/GitDataProvider.java b/src/main/java/pl/project13/maven/git/GitDataProvider.java
index da16167a..a2a1cbc7 100644
--- a/src/main/java/pl/project13/maven/git/GitDataProvider.java
+++ b/src/main/java/pl/project13/maven/git/GitDataProvider.java
@@ -119,9 +119,9 @@ public void loadGitData(@Nonnull String evaluateOnCommit, @Nonnull Properties pr
     this.evaluateOnCommit = evaluateOnCommit;
     init();
     // git.user.name
-    maybePut(properties, GitCommitPropertyConstant.BUILD_AUTHOR_NAME, () -> getBuildAuthorName());
+    maybePut(properties, GitCommitPropertyConstant.BUILD_AUTHOR_NAME, this::getBuildAuthorName);
     // git.user.email
-    maybePut(properties, GitCommitPropertyConstant.BUILD_AUTHOR_EMAIL, () -> getBuildAuthorEmail());
+    maybePut(properties, GitCommitPropertyConstant.BUILD_AUTHOR_EMAIL, this::getBuildAuthorEmail);
 
     try {
       prepareGitToExtractMoreDetailedRepoInformation();
@@ -135,11 +135,11 @@ public void loadGitData(@Nonnull String evaluateOnCommit, @Nonnull Properties pr
       // git.commit.id
       switch (commitIdGenerationMode) {
         case FULL: {
-          maybePut(properties, GitCommitPropertyConstant.COMMIT_ID_FULL, () -> getCommitId());
+          maybePut(properties, GitCommitPropertyConstant.COMMIT_ID_FULL, this::getCommitId);
           break;
         }
         case FLAT: {
-          maybePut(properties, GitCommitPropertyConstant.COMMIT_ID_FLAT, () -> getCommitId());
+          maybePut(properties, GitCommitPropertyConstant.COMMIT_ID_FLAT, this::getCommitId);
           break;
         }
         default: {
@@ -147,31 +147,31 @@ public void loadGitData(@Nonnull String evaluateOnCommit, @Nonnull Properties pr
         }
       }
       // git.commit.id.abbrev
-      maybePut(properties, GitCommitPropertyConstant.COMMIT_ID_ABBREV, () -> getAbbrevCommitId());
+      maybePut(properties, GitCommitPropertyConstant.COMMIT_ID_ABBREV, this::getAbbrevCommitId);
       // git.dirty
       maybePut(properties, GitCommitPropertyConstant.DIRTY, () -> Boolean.toString(isDirty()));
       // git.commit.author.name
-      maybePut(properties, GitCommitPropertyConstant.COMMIT_AUTHOR_NAME, () -> getCommitAuthorName());
+      maybePut(properties, GitCommitPropertyConstant.COMMIT_AUTHOR_NAME, this::getCommitAuthorName);
       // git.commit.author.email
-      maybePut(properties, GitCommitPropertyConstant.COMMIT_AUTHOR_EMAIL, () -> getCommitAuthorEmail());
+      maybePut(properties, GitCommitPropertyConstant.COMMIT_AUTHOR_EMAIL, this::getCommitAuthorEmail);
       // git.commit.message.full
-      maybePut(properties, GitCommitPropertyConstant.COMMIT_MESSAGE_FULL, () -> getCommitMessageFull());
+      maybePut(properties, GitCommitPropertyConstant.COMMIT_MESSAGE_FULL, this::getCommitMessageFull);
       // git.commit.message.short
-      maybePut(properties, GitCommitPropertyConstant.COMMIT_MESSAGE_SHORT, () -> getCommitMessageShort());
+      maybePut(properties, GitCommitPropertyConstant.COMMIT_MESSAGE_SHORT, this::getCommitMessageShort);
       // git.commit.time
-      maybePut(properties, GitCommitPropertyConstant.COMMIT_TIME, () -> getCommitTime());
+      maybePut(properties, GitCommitPropertyConstant.COMMIT_TIME, this::getCommitTime);
       // git remote.origin.url
-      maybePut(properties, GitCommitPropertyConstant.REMOTE_ORIGIN_URL, () -> getRemoteOriginUrl());
+      maybePut(properties, GitCommitPropertyConstant.REMOTE_ORIGIN_URL, this::getRemoteOriginUrl);
 
       //
-      maybePut(properties, GitCommitPropertyConstant.TAGS, () -> getTags());
+      maybePut(properties, GitCommitPropertyConstant.TAGS, this::getTags);
 
-      maybePut(properties,GitCommitPropertyConstant.CLOSEST_TAG_NAME, () -> getClosestTagName());
-      maybePut(properties,GitCommitPropertyConstant.CLOSEST_TAG_COMMIT_COUNT, () -> getClosestTagCommitCount());
+      maybePut(properties,GitCommitPropertyConstant.CLOSEST_TAG_NAME, this::getClosestTagName);
+      maybePut(properties,GitCommitPropertyConstant.CLOSEST_TAG_COMMIT_COUNT, this::getClosestTagCommitCount);
 
-      maybePut(properties,GitCommitPropertyConstant.TOTAL_COMMIT_COUNT, () -> getTotalCommitCount());
+      maybePut(properties,GitCommitPropertyConstant.TOTAL_COMMIT_COUNT, this::getTotalCommitCount);
 
-      SupplierEx<AheadBehind> aheadBehindSupplier = memoize(() -> getAheadBehind());
+      SupplierEx<AheadBehind> aheadBehindSupplier = memoize(this::getAheadBehind);
       maybePut(properties, GitCommitPropertyConstant.LOCAL_BRANCH_AHEAD, () -> aheadBehindSupplier.get().ahead());
       maybePut(properties, GitCommitPropertyConstant.LOCAL_BRANCH_BEHIND, () -> aheadBehindSupplier.get().behind());
     } finally {
@@ -184,7 +184,7 @@ private void maybePutGitDescribe(@Nonnull Properties properties) throws GitCommi
     boolean isGitDescribeOptOutByConfiguration = (gitDescribe != null && !gitDescribe.isSkip());
 
     if (isGitDescribeOptOutByDefault || isGitDescribeOptOutByConfiguration) {
-      maybePut(properties, GitCommitPropertyConstant.COMMIT_DESCRIBE, () -> getGitDescribe());
+      maybePut(properties, GitCommitPropertyConstant.COMMIT_DESCRIBE, this::getGitDescribe);
     }
   }
 
diff --git a/src/main/java/pl/project13/maven/git/JGitProvider.java b/src/main/java/pl/project13/maven/git/JGitProvider.java
index 1e06db8e..6d80bd10 100644
--- a/src/main/java/pl/project13/maven/git/JGitProvider.java
+++ b/src/main/java/pl/project13/maven/git/JGitProvider.java
@@ -145,10 +145,9 @@ private String getBranchForCommitish() throws GitCommitIdExecutionException {
               .filter(ref -> commitId.equals(ref.getObjectId().name()))
               .map(ref -> Repository.shortenRefName(ref.getName()))
               .distinct()
+              .sorted()
               .collect(Collectors.toList());
 
-      Collections.sort(branchesForCommit);
-
       String branch = branchesForCommit.stream()
               .collect(Collectors.joining(","));
 
diff --git a/src/main/java/pl/project13/maven/git/build/BambooBuildServerData.java b/src/main/java/pl/project13/maven/git/build/BambooBuildServerData.java
index b73ad8c5..a40b3573 100644
--- a/src/main/java/pl/project13/maven/git/build/BambooBuildServerData.java
+++ b/src/main/java/pl/project13/maven/git/build/BambooBuildServerData.java
@@ -22,7 +22,6 @@
 
 import javax.annotation.Nonnull;
 import java.util.*;
-import java.util.stream.Stream;
 
 public class BambooBuildServerData extends BuildServerDataProvider {
 
diff --git a/src/test/java/pl/project13/maven/git/BigDiffTest.java b/src/test/java/pl/project13/maven/git/BigDiffTest.java
index a66c5890..4a7d5833 100644
--- a/src/test/java/pl/project13/maven/git/BigDiffTest.java
+++ b/src/test/java/pl/project13/maven/git/BigDiffTest.java
@@ -19,7 +19,6 @@
 
 import junitparams.JUnitParamsRunner;
 import org.apache.maven.project.MavenProject;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java b/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java
index c6ea0ca1..0b0fa993 100644
--- a/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java
+++ b/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java
@@ -177,7 +177,7 @@ public void shouldExcludeAndIncludeAsConfiguredProperties(boolean useNativeGit)
     setProjectToExecuteMojoIn(targetProject);
     mojo.useNativeGit = useNativeGit;
     mojo.includeOnlyProperties = Arrays.asList("git.remote.origin.url", ".*.user.*");
-    mojo.excludeProperties = Arrays.asList("git.build.user.email");
+    mojo.excludeProperties = Collections.singletonList("git.build.user.email");
 
     // when
     mojo.execute();