diff --git a/build.gradle b/build.gradle
index e9f2a32686..20b5f2592c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ run {
 processResources {
     from(sourceSets.main.resources.srcDirs) {
         include '**/*.properties'
-        filter(ReplaceTokens, tokens: [ 'app.version': project.version ])
+        filter(ReplaceTokens, tokens: ['app.version': project.version])
     }
 }
 
diff --git a/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java b/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
index 18da83cfd6..0681871f1f 100644
--- a/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
+++ b/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
@@ -41,7 +41,8 @@ public class BitsquareAppMain extends BitsquareExecutable {
     protected void customizeOptionParsing(OptionParser parser) {
         parser.accepts(USER_DATA_DIR_KEY, "User data directory").withRequiredArg().defaultsTo(DEFAULT_USER_DATA_DIR);
         parser.accepts(APP_NAME_KEY, "Application name").withRequiredArg().defaultsTo(DEFAULT_APP_NAME);
-        parser.accepts(APP_DATA_DIR_KEY, "Application data directory").withRequiredArg().defaultsTo(DEFAULT_APP_DATA_DIR);
+        parser.accepts(APP_DATA_DIR_KEY, "Application data directory").withRequiredArg()
+                .defaultsTo(DEFAULT_APP_DATA_DIR);
         parser.accepts(NAME_KEY, "Name of this node").withRequiredArg();
         parser.accepts(PORT_KEY, "Port to listen on").withRequiredArg().defaultsTo(String.valueOf(Node.DEFAULT_PORT));
         parser.accepts(BITCOIN_NETWORK_KEY).withRequiredArg().defaultsTo(BitcoinModule.DEFAULT_BITCOIN_NETWORK);
diff --git a/src/main/java/io/bitsquare/btc/BitcoinModule.java b/src/main/java/io/bitsquare/btc/BitcoinModule.java
index 718e7642cb..2105829d3a 100644
--- a/src/main/java/io/bitsquare/btc/BitcoinModule.java
+++ b/src/main/java/io/bitsquare/btc/BitcoinModule.java
@@ -52,7 +52,8 @@ public class BitcoinModule extends BitsquareModule {
 
         File walletDir = new File(env.getRequiredProperty(WalletService.DIR_KEY));
         bind(File.class).annotatedWith(named(WalletService.DIR_KEY)).toInstance(walletDir);
-        bindConstant().annotatedWith(named(WalletService.PREFIX_KEY)).to(env.getRequiredProperty(WalletService.PREFIX_KEY));
+        bindConstant().annotatedWith(named(WalletService.PREFIX_KEY)).to(
+                env.getRequiredProperty(WalletService.PREFIX_KEY));
         bind(WalletService.class).asEagerSingleton();
 
         bind(BlockChainService.class).asEagerSingleton();
diff --git a/src/main/java/io/bitsquare/btc/WalletService.java b/src/main/java/io/bitsquare/btc/WalletService.java
index 3780083a5e..faff9f9491 100644
--- a/src/main/java/io/bitsquare/btc/WalletService.java
+++ b/src/main/java/io/bitsquare/btc/WalletService.java
@@ -124,8 +124,8 @@ public class WalletService {
 
     @Inject
     public WalletService(NetworkParameters params, FeePolicy feePolicy, SignatureService signatureService,
-                        Persistence persistence, UserAgent userAgent,
-                        @Named(DIR_KEY) File walletDir, @Named(PREFIX_KEY) String walletPrefix) {
+                         Persistence persistence, UserAgent userAgent,
+                         @Named(DIR_KEY) File walletDir, @Named(PREFIX_KEY) String walletPrefix) {
         this.params = params;
         this.feePolicy = feePolicy;
         this.signatureService = signatureService;
diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserViewCB.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserViewCB.java
index aeb0184546..39999f49fa 100644
--- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserViewCB.java
@@ -68,7 +68,7 @@ public class ArbitratorBrowserViewCB extends CachedViewCB implements ArbitratorL
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public ArbitratorBrowserViewCB(AccountSettings accountSettings, Persistence persistence, 
+    public ArbitratorBrowserViewCB(AccountSettings accountSettings, Persistence persistence,
                                    MessageService messageService) {
         this.accountSettings = accountSettings;
         this.persistence = persistence;
diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileViewCB.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileViewCB.java
index 203a6f7aac..dfff359eb3 100644
--- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileViewCB.java
@@ -53,7 +53,7 @@ public class ArbitratorProfileViewCB extends CachedViewCB {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public ArbitratorProfileViewCB(ApplicationPreferences applicationPreferences, Persistence persistence, 
+    public ArbitratorProfileViewCB(ApplicationPreferences applicationPreferences, Persistence persistence,
                                    BSFormatter formatter) {
         this.applicationPreferences = applicationPreferences;
         this.persistence = persistence;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountModel.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountModel.java
index 84904cc99c..b06ff050e8 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountModel.java
@@ -78,7 +78,8 @@ class IrcAccountModel extends UIModel {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    IrcAccountModel(User user, Persistence persistence, AccountSettings accountSettings, MessageService messageService) {
+    IrcAccountModel(User user, Persistence persistence, AccountSettings accountSettings,
+                    MessageService messageService) {
         this.persistence = persistence;
         this.user = user;
         this.accountSettings = accountSettings;
diff --git a/src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesView.fxml b/src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesView.fxml
index c8df992f87..62deed7cc1 100644
--- a/src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesView.fxml
@@ -35,7 +35,7 @@
     <TitledGroupBg text="General application preferences" GridPane.rowSpan="8"/>
 
     <Label text="Bitcoin denomination:" GridPane.rowIndex="0">
-    <GridPane.margin>
+        <GridPane.margin>
             <Insets top="10"/>
         </GridPane.margin>
     </Label>
diff --git a/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesPM.java b/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesPM.java
index 62289c0d4d..dc86c46019 100644
--- a/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesPM.java
+++ b/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesPM.java
@@ -91,7 +91,7 @@ public class NetworkPreferencesPM extends PresentationModel<NetworkPreferencesMo
     String bootstrapAddress() {
         return model.bootstrapAddress;
     }
-    
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Private
     ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java
index 5866d20554..843b224868 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java
@@ -83,8 +83,8 @@ class TakeOfferModel extends UIModel {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    TakeOfferModel(TradeManager tradeManager, WalletService walletService, ApplicationPreferences applicationPreferences,
-                   Persistence persistence) {
+    TakeOfferModel(TradeManager tradeManager, WalletService walletService,
+                   ApplicationPreferences applicationPreferences, Persistence persistence) {
         this.tradeManager = tradeManager;
         this.walletService = walletService;
         this.applicationPreferences = applicationPreferences;
diff --git a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java
index 93ca454dca..1364a6d7ff 100644
--- a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java
+++ b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java
@@ -17,8 +17,8 @@
 
 package io.bitsquare.msg.tomp2p;
 
-import io.bitsquare.msg.MessageService;
 import io.bitsquare.msg.MessageModule;
+import io.bitsquare.msg.MessageService;
 import io.bitsquare.network.BootstrapNodes;
 import io.bitsquare.network.Node;
 
@@ -42,7 +42,7 @@ public class TomP2PMessageModule extends MessageModule {
     @Override
     protected void doConfigure() {
         bind(int.class).annotatedWith(Names.named(Node.PORT_KEY)).toInstance(
-            env.getProperty(Node.PORT_KEY, Integer.class, Node.DEFAULT_PORT));
+                env.getProperty(Node.PORT_KEY, Integer.class, Node.DEFAULT_PORT));
         bind(TomP2PNode.class).asEagerSingleton();
 
         bind(Node.class).annotatedWith(Names.named(BOOTSTRAP_NODE_KEY)).toInstance(
diff --git a/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java b/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java
index f427554783..30c254f228 100644
--- a/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java
+++ b/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java
@@ -46,12 +46,15 @@ public class BitsquareEnvironmentTests {
                 .withProperty("key.y", "y.env");
 
         ConfigurableEnvironment env = new BitsquareEnvironment(commandlineProps) {
-            @Override PropertySource<?> filesystemProperties() { return filesystemProps; }
+            @Override
+            PropertySource<?> filesystemProperties() {
+                return filesystemProps;
+            }
         };
         MutablePropertySources propertySources = env.getPropertySources();
 
         assertThat(propertySources.precedenceOf(named(BITSQUARE_COMMANDLINE_PROPERTY_SOURCE_NAME)), equalTo(0));
-        assertThat(propertySources.precedenceOf(named(SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME)),  equalTo(1));
+        assertThat(propertySources.precedenceOf(named(SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME)), equalTo(1));
         assertThat(propertySources.precedenceOf(named(SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME)), equalTo(2));
         assertThat(propertySources.precedenceOf(named(BITSQUARE_FILESYSTEM_PROPERTY_SOURCE_NAME)), equalTo(3));
         assertThat(propertySources.precedenceOf(named(BITSQUARE_CLASSPATH_PROPERTY_SOURCE_NAME)), equalTo(4));
diff --git a/src/test/java/io/bitsquare/app/gui/ViewLoaderTests.java b/src/test/java/io/bitsquare/app/gui/ViewLoaderTests.java
index c163ea78c0..7f2f3a0453 100644
--- a/src/test/java/io/bitsquare/app/gui/ViewLoaderTests.java
+++ b/src/test/java/io/bitsquare/app/gui/ViewLoaderTests.java
@@ -63,7 +63,7 @@ public class ViewLoaderTests {
     @Before
     public void setUp() {
         OptionParser parser = new OptionParser();
-        BitsquareEnvironment env = new BitsquareEnvironment(parser.parse(new String[] {}));
+        BitsquareEnvironment env = new BitsquareEnvironment(parser.parse(new String[]{}));
         Injector injector = Guice.createInjector(new BitsquareAppModule(env, TestApp.primaryStage));
         ViewLoader.setInjector(injector);
     }