diff --git a/build.gradle b/build.gradle
index db3ed840..3d7d1440 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,25 +23,25 @@ def loadConfiguration() {
 
 loadConfiguration()
 
-ext.buildNumber           = System.getenv('TRAVIS_BUILD_NUMBER') ?: '0'
+ext.buildNumber = System.getenv('TRAVIS_BUILD_NUMBER') ?: '0'
 ext.sdkmanCliBuildVersion = "${config.sdkmanCliVersion}+${buildNumber}".toString()
 
 repositories.jcenter()
 
 dependencies {
-	testImplementation(group: 'com.github.tomakehurst', name: 'wiremock',         version: '2.25.1') {
+	testImplementation('com.github.tomakehurst:wiremock:2.25.1') {
 		exclude(module: 'junit')
 	}
-	testImplementation(group: 'io.cucumber',            name: 'cucumber-groovy',  version: '4.7.1')
-	testImplementation(group: 'io.cucumber',            name: 'cucumber-junit',   version: '4.7.4')
-	testImplementation(group: 'io.cucumber',            name: 'gherkin',          version: '5.2.0')
-	testImplementation(group: 'junit',                  name: 'junit',            version: '4.13')
-	testImplementation(group: 'org.codehaus.groovy',    name: 'groovy',           version: '2.4.19')
-	testImplementation(group: 'org.codehaus.groovy',    name: 'groovy-json',      version: '2.4.19')
-	testImplementation(group: 'org.codehaus.groovy',    name: 'groovy-templates', version: '2.4.19')
-	testImplementation(group: 'org.slf4j',              name: 'slf4j-api',        version: '1.7.30')
-	testImplementation(group: 'org.slf4j',              name: 'slf4j-simple',     version: '1.7.30')
-	testImplementation(group: 'org.spockframework',     name: 'spock-core',       version: '1.3-groovy-2.4') {
+	testImplementation('io.cucumber:cucumber-groovy:4.7.1')
+	testImplementation('io.cucumber:cucumber-junit:4.7.4')
+	testImplementation('io.cucumber:gherkin:5.2.0')
+	testImplementation('junit:junit:4.13')
+	testImplementation('org.codehaus.groovy:groovy:2.4.19')
+	testImplementation('org.codehaus.groovy:groovy-json:2.4.19')
+	testImplementation('org.codehaus.groovy:groovy-templates:2.4.19')
+	testImplementation('org.slf4j:slf4j-api:1.7.30')
+	testImplementation('org.slf4j:slf4j-simple:1.7.30')
+	testImplementation('org.spockframework:spock-core:1.3-groovy-2.4') {
 		exclude(module: 'groovy-all')
 	}
 }
@@ -51,11 +51,11 @@ task prepareScripts(type: Copy) {
 	into('build/scripts')
 	include('**/*')
 	filter(
-		ReplaceTokens,
-		tokens: [
-			SDKMAN_VERSION:        sdkmanCliBuildVersion,
-			SDKMAN_CANDIDATES_API: config.candidatesApi
-		]
+			ReplaceTokens,
+			tokens: [
+					SDKMAN_VERSION       : sdkmanCliBuildVersion,
+					SDKMAN_CANDIDATES_API: config.candidatesApi
+			]
 	)
 }
 
@@ -66,7 +66,7 @@ tasks.test.configure {
 
 task assembleArchive(type: Zip, dependsOn: prepareScripts) {
 	archiveAppendix = 'cli'
-	archiveVersion  = sdkmanCliBuildVersion
+	archiveVersion = sdkmanCliBuildVersion
 	from('build/scripts')
 	include('*.sh*')
 }
@@ -99,22 +99,22 @@ task installModules(type: Copy, dependsOn: [cleanInstallModules, prepareScripts]
 task install(dependsOn: [installInit, installModules])
 
 bintray {
-	user    = System.getenv('BINTRAY_USERNAME')
-	key     = System.getenv('BINTRAY_API_KEY')
+	user = System.getenv('BINTRAY_USERNAME')
+	key = System.getenv('BINTRAY_API_KEY')
 	publish = true
 	filesSpec {
 		from('build/distributions')
 		into('.')
 	}
 	pkg {
-		repo     = 'generic'
-		name     = 'sdkman-cli'
-		userOrg  = 'sdkman'
+		repo = 'generic'
+		name = 'sdkman-cli'
+		userOrg = 'sdkman'
 		licenses = ['Apache-2.0']
-		vcsUrl   = 'https://github.com/sdkman/sdkman-cli.git'
+		vcsUrl = 'https://github.com/sdkman/sdkman-cli.git'
 		version {
-			name     = sdkmanCliBuildVersion
-			desc     = 'Binary zip distribution of SDKMAN bash client.'
+			name = sdkmanCliBuildVersion
+			desc = 'Binary zip distribution of SDKMAN bash client.'
 			released = new Date()
 		}
 	}