diff --git a/jvm/src/main/groovy/org/asciidoctor/gradle/jvm/AbstractAsciidoctorTask.groovy b/jvm/src/main/groovy/org/asciidoctor/gradle/jvm/AbstractAsciidoctorTask.groovy
index fc61b613..ef223bb1 100644
--- a/jvm/src/main/groovy/org/asciidoctor/gradle/jvm/AbstractAsciidoctorTask.groovy
+++ b/jvm/src/main/groovy/org/asciidoctor/gradle/jvm/AbstractAsciidoctorTask.groovy
@@ -110,7 +110,8 @@ class AbstractAsciidoctorTask extends AbstractJvmModelExecTask<AsciidoctorJvmExe
 
     protected final MapProperty<String, Object> optionsProperty = project.objects.mapProperty(String, Object)
     protected final MapProperty<String, Object> attributesProperty = project.objects.mapProperty(String, Object)
-    protected final ListProperty<AsciidoctorAttributeProvider> attributeProviderProperty = project.objects.listProperty(AsciidoctorAttributeProvider)
+    protected final ListProperty<AsciidoctorAttributeProvider> attributeProviderProperty = project.objects
+            .listProperty(AsciidoctorAttributeProvider)
     protected FileCollection configurationsFileCollection
     protected final ListProperty<Pattern> fatalWarningsProperty = project.objects.listProperty(Pattern)
     protected final ListProperty<String> requiresProperty = project.objects.listProperty(String)
@@ -141,7 +142,7 @@ class AbstractAsciidoctorTask extends AbstractJvmModelExecTask<AsciidoctorJvmExe
     } as Provider<FileCollection>
 
     private final Provider<Map<String, Map<String, Object>>> attributesByLangProvider = project.provider {
-        def attributesByLang = new HashMap<String, Map<String, Object>>()
+        def attributesByLang = [:]
         languagesAsOptionals.each { lang ->
             if (lang.isPresent()) {
                 attributesByLang.put(lang.get(), getAsciidoctorJExtension().getAttributesForLang(lang.get()))
@@ -401,8 +402,8 @@ class AbstractAsciidoctorTask extends AbstractJvmModelExecTask<AsciidoctorJvmExe
      */
     @Override
     Set<Configuration> getReportableConfigurations() {
-        ([getAsciidoctorJExtension().configuration] + projectOperations.configurations.asConfigurations(asciidocConfigurations))
-                .toSet()
+        ([getAsciidoctorJExtension().configuration] + projectOperations.configurations
+                .asConfigurations(asciidocConfigurations)).toSet()
     }
 
     /**