diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 4173b0e407..6d74efc6df 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -4,6 +4,75 @@
     <option name="PER_PROJECT_SETTINGS">
       <value>
         <option name="LINE_SEPARATOR" value="&#10;" />
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="2" />
+        <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+          <value>
+            <package name="java.awt" withSubpackages="false" static="false" />
+            <package name="javafx.scene" withSubpackages="true" static="false" />
+            <package name="javax.swing" withSubpackages="false" static="false" />
+            <package name="org.junit.Assert" withSubpackages="true" static="true" />
+          </value>
+        </option>
+        <option name="IMPORT_LAYOUT_TABLE">
+          <value>
+            <package name="io.bitsquare" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="com.google.bitcoin" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="com.google.common" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="com.google.gson" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="com.google.inject" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="java.awt" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="java.io" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="java.math" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="java.net" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="java.nio" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="java.security" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="java.text" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="java.util" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="javax.annotation" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="javax.inject" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="javax.swing" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="javafx" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="com.sun.javafx" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="de.jensd.fx" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="net.glxn" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="net.tomp2p" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="org.controlsfx" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="org.jetbrains" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="org.junit" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="org.slf4j" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="org.spongycastle" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="true" />
+          </value>
+        </option>
         <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
         <XML>
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
diff --git a/src/main/java/io/bitsquare/BitSquare.java b/src/main/java/io/bitsquare/BitSquare.java
index 12cee92025..0539aa0551 100644
--- a/src/main/java/io/bitsquare/BitSquare.java
+++ b/src/main/java/io/bitsquare/BitSquare.java
@@ -17,9 +17,6 @@
 
 package io.bitsquare;
 
-import com.google.common.base.Throwables;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.di.BitSquareModule;
 import io.bitsquare.di.GuiceFXMLLoader;
@@ -33,17 +30,21 @@ import io.bitsquare.user.User;
 import io.bitsquare.util.AWTSystemTray;
 import io.bitsquare.util.StorageDirectory;
 
+import com.google.common.base.Throwables;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
 import java.io.File;
 import java.io.IOException;
+
 import java.util.Arrays;
 
 import javafx.application.Application;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyCodeCombination;
-import javafx.scene.input.KeyCombination;
+import javafx.scene.*;
+import javafx.scene.input.*;
 import javafx.stage.Stage;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/SeedNode.java b/src/main/java/io/bitsquare/SeedNode.java
index 2763092112..16f2ff4797 100644
--- a/src/main/java/io/bitsquare/SeedNode.java
+++ b/src/main/java/io/bitsquare/SeedNode.java
@@ -20,6 +20,7 @@ package io.bitsquare;
 import io.bitsquare.msg.SeedNodeAddress;
 
 import java.io.IOException;
+
 import java.util.List;
 
 import net.tomp2p.dht.PeerBuilderDHT;
@@ -35,6 +36,7 @@ import net.tomp2p.peers.PeerMapChangeListener;
 import net.tomp2p.peers.PeerStatatistic;
 import net.tomp2p.relay.FutureRelay;
 import net.tomp2p.relay.RelayRPC;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/bank/BankAccount.java b/src/main/java/io/bitsquare/bank/BankAccount.java
index 223dc00462..99a7923d65 100644
--- a/src/main/java/io/bitsquare/bank/BankAccount.java
+++ b/src/main/java/io/bitsquare/bank/BankAccount.java
@@ -20,8 +20,10 @@ package io.bitsquare.bank;
 import io.bitsquare.locale.Country;
 
 import java.io.Serializable;
+
 import java.util.Currency;
 import java.util.Objects;
+
 import javax.annotation.concurrent.Immutable;
 
 @Immutable
diff --git a/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java b/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
index 6ff11633c2..110a152250 100644
--- a/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
+++ b/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
@@ -17,14 +17,25 @@
 
 package io.bitsquare.btc;
 
-import com.google.bitcoin.core.*;
+import com.google.bitcoin.core.Address;
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.NetworkParameters;
+import com.google.bitcoin.core.Transaction;
+import com.google.bitcoin.core.TransactionConfidence;
+import com.google.bitcoin.core.TransactionOutput;
 import com.google.bitcoin.params.RegTestParams;
 import com.google.bitcoin.wallet.CoinSelection;
 import com.google.bitcoin.wallet.DefaultCoinSelector;
+
 import com.google.common.annotations.VisibleForTesting;
 
 import java.math.BigInteger;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/bitsquare/btc/FeePolicy.java b/src/main/java/io/bitsquare/btc/FeePolicy.java
index 03c291972b..eee63e6f71 100644
--- a/src/main/java/io/bitsquare/btc/FeePolicy.java
+++ b/src/main/java/io/bitsquare/btc/FeePolicy.java
@@ -17,7 +17,11 @@
 
 package io.bitsquare.btc;
 
-import com.google.bitcoin.core.*;
+import com.google.bitcoin.core.Address;
+import com.google.bitcoin.core.AddressFormatException;
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.NetworkParameters;
+import com.google.bitcoin.core.Transaction;
 
 import javax.inject.Inject;
 
diff --git a/src/main/java/io/bitsquare/btc/WalletFacade.java b/src/main/java/io/bitsquare/btc/WalletFacade.java
index 2abe0fde6f..cfe1e376e4 100644
--- a/src/main/java/io/bitsquare/btc/WalletFacade.java
+++ b/src/main/java/io/bitsquare/btc/WalletFacade.java
@@ -17,7 +17,30 @@
 
 package io.bitsquare.btc;
 
-import com.google.bitcoin.core.*;
+import io.bitsquare.BitSquare;
+import io.bitsquare.btc.listeners.BalanceListener;
+import io.bitsquare.btc.listeners.ConfidenceListener;
+import io.bitsquare.crypto.CryptoFacade;
+import io.bitsquare.storage.Persistence;
+import io.bitsquare.util.StorageDirectory;
+
+import com.google.bitcoin.core.Address;
+import com.google.bitcoin.core.AddressFormatException;
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.ECKey;
+import com.google.bitcoin.core.InsufficientMoneyException;
+import com.google.bitcoin.core.NetworkParameters;
+import com.google.bitcoin.core.ScriptException;
+import com.google.bitcoin.core.Sha256Hash;
+import com.google.bitcoin.core.Transaction;
+import com.google.bitcoin.core.TransactionConfidence;
+import com.google.bitcoin.core.TransactionInput;
+import com.google.bitcoin.core.TransactionOutPoint;
+import com.google.bitcoin.core.TransactionOutput;
+import com.google.bitcoin.core.Utils;
+import com.google.bitcoin.core.VerificationException;
+import com.google.bitcoin.core.Wallet;
+import com.google.bitcoin.core.WalletEventListener;
 import com.google.bitcoin.crypto.DeterministicKey;
 import com.google.bitcoin.crypto.TransactionSignature;
 import com.google.bitcoin.kits.WalletAppKit;
@@ -26,29 +49,32 @@ import com.google.bitcoin.params.RegTestParams;
 import com.google.bitcoin.script.Script;
 import com.google.bitcoin.script.ScriptBuilder;
 import com.google.bitcoin.utils.Threading;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import io.bitsquare.BitSquare;
-import io.bitsquare.btc.listeners.BalanceListener;
-import io.bitsquare.btc.listeners.ConfidenceListener;
-import io.bitsquare.crypto.CryptoFacade;
-import io.bitsquare.storage.Persistence;
-import io.bitsquare.util.StorageDirectory;
 
 import java.io.Serializable;
+
 import java.math.BigInteger;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 
+import javax.annotation.concurrent.GuardedBy;
+
+import javax.inject.Inject;
+
 import javafx.application.Platform;
 import javafx.util.Pair;
 
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Inject;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/crypto/CryptoFacade.java b/src/main/java/io/bitsquare/crypto/CryptoFacade.java
index 1e133ab6f2..443e0063ed 100644
--- a/src/main/java/io/bitsquare/crypto/CryptoFacade.java
+++ b/src/main/java/io/bitsquare/crypto/CryptoFacade.java
@@ -21,15 +21,20 @@ import com.google.bitcoin.core.ECKey;
 import com.google.bitcoin.core.Sha256Hash;
 import com.google.bitcoin.core.Utils;
 import com.google.bitcoin.crypto.KeyCrypterException;
+
 import com.google.common.base.Charsets;
 
 import java.nio.charset.Charset;
+
 import java.security.SignatureException;
+
 import javax.annotation.Nullable;
+
 import javax.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.spongycastle.crypto.params.KeyParameter;
 import org.spongycastle.util.encoders.Base64;
 
diff --git a/src/main/java/io/bitsquare/di/BitSquareModule.java b/src/main/java/io/bitsquare/di/BitSquareModule.java
index 1b79e12198..875a4bd384 100644
--- a/src/main/java/io/bitsquare/di/BitSquareModule.java
+++ b/src/main/java/io/bitsquare/di/BitSquareModule.java
@@ -18,14 +18,6 @@
 package io.bitsquare.di;
 
 
-import com.google.bitcoin.core.NetworkParameters;
-import com.google.bitcoin.params.MainNetParams;
-import com.google.bitcoin.params.RegTestParams;
-import com.google.bitcoin.params.TestNet3Params;
-import com.google.inject.AbstractModule;
-import com.google.inject.Provider;
-import com.google.inject.name.Named;
-import com.google.inject.name.Names;
 import io.bitsquare.btc.BlockChainFacade;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.WalletFacade;
@@ -41,6 +33,16 @@ import io.bitsquare.trade.TradeManager;
 import io.bitsquare.trade.orderbook.OrderBook;
 import io.bitsquare.user.User;
 
+import com.google.bitcoin.core.NetworkParameters;
+import com.google.bitcoin.params.MainNetParams;
+import com.google.bitcoin.params.RegTestParams;
+import com.google.bitcoin.params.TestNet3Params;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Provider;
+import com.google.inject.name.Named;
+import com.google.inject.name.Names;
+
 import javax.inject.Inject;
 
 public class BitSquareModule extends AbstractModule {
diff --git a/src/main/java/io/bitsquare/di/GuiceFXMLLoader.java b/src/main/java/io/bitsquare/di/GuiceFXMLLoader.java
index d3dd60414b..ff40d7af19 100644
--- a/src/main/java/io/bitsquare/di/GuiceFXMLLoader.java
+++ b/src/main/java/io/bitsquare/di/GuiceFXMLLoader.java
@@ -17,15 +17,18 @@
 
 package io.bitsquare.di;
 
-import com.google.inject.Injector;
 import io.bitsquare.locale.Localisation;
 
+import com.google.inject.Injector;
+
 import java.net.URL;
+
 import java.util.HashMap;
 import java.util.Map;
 
 import javafx.fxml.FXMLLoader;
 import javafx.util.Callback;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/CachedViewController.java b/src/main/java/io/bitsquare/gui/CachedViewController.java
index 8a5710c306..d3cbde66ec 100644
--- a/src/main/java/io/bitsquare/gui/CachedViewController.java
+++ b/src/main/java/io/bitsquare/gui/CachedViewController.java
@@ -18,6 +18,7 @@
 package io.bitsquare.gui;
 
 import java.net.URL;
+
 import java.util.ResourceBundle;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/io/bitsquare/gui/MainController.java b/src/main/java/io/bitsquare/gui/MainController.java
index a5aae36f95..03bdb4106d 100644
--- a/src/main/java/io/bitsquare/gui/MainController.java
+++ b/src/main/java/io/bitsquare/gui/MainController.java
@@ -17,7 +17,6 @@
 
 package io.bitsquare.gui;
 
-import com.google.bitcoin.core.Coin;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.btc.listeners.BalanceListener;
@@ -35,24 +34,28 @@ import io.bitsquare.trade.TradeManager;
 import io.bitsquare.user.User;
 import io.bitsquare.util.AWTSystemTray;
 
+import com.google.bitcoin.core.Coin;
+
 import java.io.IOException;
+
 import java.net.URL;
+
 import java.util.ResourceBundle;
 
+import javax.inject.Inject;
+
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
-import javafx.scene.Node;
+import javafx.scene.*;
 import javafx.scene.control.*;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
+import javafx.scene.image.*;
 import javafx.scene.layout.*;
 import javafx.util.StringConverter;
 
-import javax.inject.Inject;
-
 import net.tomp2p.peers.PeerAddress;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/ViewController.java b/src/main/java/io/bitsquare/gui/ViewController.java
index 18ba5b14fe..7646b85443 100644
--- a/src/main/java/io/bitsquare/gui/ViewController.java
+++ b/src/main/java/io/bitsquare/gui/ViewController.java
@@ -18,11 +18,13 @@
 package io.bitsquare.gui;
 
 import java.net.URL;
+
 import java.util.ResourceBundle;
 
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
-import javafx.scene.Parent;
+import javafx.scene.*;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/arbitrators/overview/ArbitratorOverviewController.java b/src/main/java/io/bitsquare/gui/arbitrators/overview/ArbitratorOverviewController.java
index b6c70275c7..ac774867a6 100644
--- a/src/main/java/io/bitsquare/gui/arbitrators/overview/ArbitratorOverviewController.java
+++ b/src/main/java/io/bitsquare/gui/arbitrators/overview/ArbitratorOverviewController.java
@@ -30,20 +30,22 @@ import io.bitsquare.storage.Persistence;
 import io.bitsquare.user.Arbitrator;
 
 import java.io.IOException;
+
 import java.net.URL;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
 
-import javafx.fxml.FXML;
-import javafx.scene.Node;
-import javafx.scene.control.Button;
-import javafx.scene.layout.Pane;
-import javafx.stage.Stage;
-
 import javax.inject.Inject;
 
+import javafx.fxml.FXML;
+import javafx.scene.*;
+import javafx.scene.control.*;
+import javafx.scene.layout.*;
+import javafx.stage.Stage;
+
 import net.tomp2p.peers.Number640;
 import net.tomp2p.storage.Data;
 
diff --git a/src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileController.java b/src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileController.java
index 10ed814263..265d96d9f1 100644
--- a/src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileController.java
+++ b/src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileController.java
@@ -26,15 +26,14 @@ import io.bitsquare.storage.Persistence;
 import io.bitsquare.user.Arbitrator;
 
 import java.net.URL;
+
 import java.util.ResourceBundle;
 
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
-
 import javax.inject.Inject;
 
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+
 public class ArbitratorProfileController extends CachedViewController {
 
     private final Settings settings;
diff --git a/src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationController.java b/src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationController.java
index c5fc3ed1a3..344704db20 100644
--- a/src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationController.java
+++ b/src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationController.java
@@ -17,10 +17,6 @@
 
 package io.bitsquare.gui.arbitrators.registration;
 
-import com.google.bitcoin.core.*;
-import com.google.bitcoin.script.Script;
-import de.jensd.fx.fontawesome.AwesomeDude;
-import de.jensd.fx.fontawesome.AwesomeIcon;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.gui.CachedViewController;
 import io.bitsquare.gui.NavigationItem;
@@ -39,18 +35,32 @@ import io.bitsquare.user.Reputation;
 import io.bitsquare.user.User;
 import io.bitsquare.util.DSAKeyUtil;
 
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.ECKey;
+import com.google.bitcoin.core.Transaction;
+import com.google.bitcoin.core.Wallet;
+import com.google.bitcoin.core.WalletEventListener;
+import com.google.bitcoin.script.Script;
+
 import java.net.URL;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import javax.inject.Inject;
 
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
-import javafx.scene.input.Clipboard;
-import javafx.scene.input.ClipboardContent;
+import javafx.scene.input.*;
 import javafx.stage.Stage;
 import javafx.util.StringConverter;
 
-import javax.inject.Inject;
+import de.jensd.fx.fontawesome.AwesomeDude;
+import de.jensd.fx.fontawesome.AwesomeIcon;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/bitsquare/gui/components/CachingTabPane.java b/src/main/java/io/bitsquare/gui/components/CachingTabPane.java
index bc9b00fc82..21f0fbf0f8 100644
--- a/src/main/java/io/bitsquare/gui/components/CachingTabPane.java
+++ b/src/main/java/io/bitsquare/gui/components/CachingTabPane.java
@@ -22,11 +22,13 @@ import io.bitsquare.gui.ViewController;
 import io.bitsquare.storage.Persistence;
 
 import java.io.IOException;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import javafx.scene.Node;
-import javafx.scene.control.TabPane;
+import javafx.scene.*;
+import javafx.scene.control.*;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/components/HSpacer.java b/src/main/java/io/bitsquare/gui/components/HSpacer.java
index f546c07461..a2465ad859 100644
--- a/src/main/java/io/bitsquare/gui/components/HSpacer.java
+++ b/src/main/java/io/bitsquare/gui/components/HSpacer.java
@@ -18,7 +18,7 @@
 package io.bitsquare.gui.components;
 
 
-import javafx.scene.layout.Pane;
+import javafx.scene.layout.*;
 
 @SuppressWarnings("WeakerAccess")
 public class HSpacer extends Pane {
diff --git a/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java b/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java
index e89629787a..901e58a4f4 100644
--- a/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java
+++ b/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java
@@ -19,9 +19,8 @@ package io.bitsquare.gui.components;
 
 import javafx.animation.FadeTransition;
 import javafx.animation.Interpolator;
-import javafx.scene.control.Label;
-import javafx.scene.control.ProgressBar;
-import javafx.scene.layout.HBox;
+import javafx.scene.control.*;
+import javafx.scene.layout.*;
 import javafx.util.Duration;
 
 public class NetworkSyncPane extends HBox {
diff --git a/src/main/java/io/bitsquare/gui/components/NoFocusScrollPane.java b/src/main/java/io/bitsquare/gui/components/NoFocusScrollPane.java
index abec480f1e..35d1196e77 100644
--- a/src/main/java/io/bitsquare/gui/components/NoFocusScrollPane.java
+++ b/src/main/java/io/bitsquare/gui/components/NoFocusScrollPane.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.components;
 
-import javafx.scene.control.ScrollPane;
+import javafx.scene.control.*;
 
 class NoFocusScrollPane extends ScrollPane {
     public NoFocusScrollPane() {
diff --git a/src/main/java/io/bitsquare/gui/components/Popups.java b/src/main/java/io/bitsquare/gui/components/Popups.java
index 7fb340e4ce..3a9fad899e 100644
--- a/src/main/java/io/bitsquare/gui/components/Popups.java
+++ b/src/main/java/io/bitsquare/gui/components/Popups.java
@@ -17,14 +17,17 @@
 
 package io.bitsquare.gui.components;
 
-import com.google.bitcoin.store.BlockStoreException;
-import com.google.common.base.Throwables;
 import io.bitsquare.BitSquare;
 
+import com.google.bitcoin.store.BlockStoreException;
+
+import com.google.common.base.Throwables;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import javafx.application.Platform;
+
 import org.controlsfx.control.action.Action;
 import org.controlsfx.dialog.Dialog;
 import org.controlsfx.dialog.Dialogs;
diff --git a/src/main/java/io/bitsquare/gui/components/VSpacer.java b/src/main/java/io/bitsquare/gui/components/VSpacer.java
index 4f64eb41fa..122f23f4c6 100644
--- a/src/main/java/io/bitsquare/gui/components/VSpacer.java
+++ b/src/main/java/io/bitsquare/gui/components/VSpacer.java
@@ -18,7 +18,7 @@
 package io.bitsquare.gui.components;
 
 
-import javafx.scene.layout.Pane;
+import javafx.scene.layout.*;
 
 public class VSpacer extends Pane {
     public VSpacer() {
diff --git a/src/main/java/io/bitsquare/gui/components/ValidatedTextField.java b/src/main/java/io/bitsquare/gui/components/ValidatedTextField.java
index 74985756ff..71299197c1 100644
--- a/src/main/java/io/bitsquare/gui/components/ValidatedTextField.java
+++ b/src/main/java/io/bitsquare/gui/components/ValidatedTextField.java
@@ -18,14 +18,21 @@
 package io.bitsquare.gui.components;
 
 import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.*;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.property.ReadOnlyIntegerProperty;
+import javafx.beans.property.ReadOnlyStringProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
-import javafx.scene.control.TextField;
-import javafx.scene.effect.BlurType;
-import javafx.scene.effect.DropShadow;
-import javafx.scene.effect.Effect;
-import javafx.scene.paint.Color;
+import javafx.scene.control.*;
+import javafx.scene.effect.*;
+import javafx.scene.paint.*;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java b/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java
index 6da872a385..bd48d0c436 100644
--- a/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java
+++ b/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java
@@ -18,19 +18,19 @@
 package io.bitsquare.gui.components;
 
 import io.bitsquare.gui.util.NumberValidator;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.geometry.Insets;
 import javafx.geometry.Point2D;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
-import javafx.scene.effect.BlurType;
-import javafx.scene.effect.DropShadow;
-import javafx.scene.effect.Effect;
-import javafx.scene.layout.Region;
-import javafx.scene.paint.Color;
+import javafx.scene.control.*;
+import javafx.scene.effect.*;
+import javafx.scene.layout.*;
+import javafx.scene.paint.*;
 import javafx.stage.Window;
+
 import org.controlsfx.control.PopOver;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/components/btc/AddressTextField.java b/src/main/java/io/bitsquare/gui/components/btc/AddressTextField.java
index 253ccfcaff..c52109af1d 100644
--- a/src/main/java/io/bitsquare/gui/components/btc/AddressTextField.java
+++ b/src/main/java/io/bitsquare/gui/components/btc/AddressTextField.java
@@ -17,31 +17,36 @@
 
 package io.bitsquare.gui.components.btc;
 
-import com.google.bitcoin.core.Coin;
-import com.google.bitcoin.uri.BitcoinURI;
-import de.jensd.fx.fontawesome.AwesomeDude;
-import de.jensd.fx.fontawesome.AwesomeIcon;
 import io.bitsquare.BitSquare;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.BitSquareFormatter;
 
-import java.awt.Desktop;
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.uri.BitcoinURI;
+
+import java.awt.*;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+
 import java.net.URI;
 
 import javafx.scene.control.Label;
-import javafx.scene.control.Tooltip;
+import javafx.scene.control.*;
 import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.Clipboard;
-import javafx.scene.input.ClipboardContent;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.Pane;
+import javafx.scene.image.*;
+import javafx.scene.input.*;
+import javafx.scene.layout.*;
 import javafx.stage.Window;
+
+import de.jensd.fx.fontawesome.AwesomeDude;
+import de.jensd.fx.fontawesome.AwesomeIcon;
+
 import net.glxn.qrgen.QRCode;
 import net.glxn.qrgen.image.ImageType;
+
 import org.controlsfx.control.PopOver;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/components/btc/BalanceTextField.java b/src/main/java/io/bitsquare/gui/components/btc/BalanceTextField.java
index c52756fbd6..4df8c3772f 100644
--- a/src/main/java/io/bitsquare/gui/components/btc/BalanceTextField.java
+++ b/src/main/java/io/bitsquare/gui/components/btc/BalanceTextField.java
@@ -17,16 +17,18 @@
 
 package io.bitsquare.gui.components.btc;
 
-import com.google.bitcoin.core.Address;
-import com.google.bitcoin.core.Coin;
-import com.google.bitcoin.core.TransactionConfidence;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.btc.listeners.BalanceListener;
 import io.bitsquare.btc.listeners.ConfidenceListener;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
-import javafx.scene.control.TextField;
-import javafx.scene.control.Tooltip;
-import javafx.scene.layout.AnchorPane;
+
+import com.google.bitcoin.core.Address;
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.TransactionConfidence;
+
+import javafx.scene.control.*;
+import javafx.scene.layout.*;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java b/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java
index 78b4bc0224..adac2e0ef9 100644
--- a/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java
+++ b/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java
@@ -43,14 +43,14 @@
 package io.bitsquare.gui.components.confidence;
 
 import io.bitsquare.gui.components.confidence.skin.ConfidenceProgressIndicatorSkin;
+
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.DoublePropertyBase;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
 import javafx.css.PseudoClass;
 import javafx.css.StyleableProperty;
-import javafx.scene.control.Control;
-import javafx.scene.control.Skin;
+import javafx.scene.control.*;
 
 
 /**
diff --git a/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java b/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java
index 44f2db8165..2b28b15086 100644
--- a/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java
+++ b/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java
@@ -41,11 +41,12 @@ package io.bitsquare.gui.components.confidence.behavior;
  * questions.
  */
 
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
 
 import java.util.Collections;
 
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+
 public class ConfidenceProgressIndicatorBehavior<C extends ConfidenceProgressIndicator> extends BehaviorBase<C> {
 
     /**
diff --git a/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java b/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java
index eab4f40f53..ebfd4c9a0f 100644
--- a/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java
+++ b/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java
@@ -42,10 +42,6 @@
 
 package io.bitsquare.gui.components.confidence.skin;
 
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.PaintConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.control.skin.BehaviorSkinBase;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
 import io.bitsquare.gui.components.confidence.behavior.ConfidenceProgressIndicatorBehavior;
 
@@ -63,22 +59,28 @@ import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.css.*;
+import javafx.css.CssMetaData;
+import javafx.css.StyleOrigin;
+import javafx.css.Styleable;
+import javafx.css.StyleableBooleanProperty;
+import javafx.css.StyleableIntegerProperty;
+import javafx.css.StyleableObjectProperty;
+import javafx.css.StyleableProperty;
 import javafx.geometry.Insets;
 import javafx.geometry.NodeOrientation;
-import javafx.scene.Node;
-import javafx.scene.control.SkinBase;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.shape.Arc;
-import javafx.scene.shape.ArcType;
-import javafx.scene.shape.Circle;
-import javafx.scene.transform.Scale;
+import javafx.scene.*;
+import javafx.scene.control.*;
+import javafx.scene.layout.*;
+import javafx.scene.paint.*;
+import javafx.scene.shape.*;
+import javafx.scene.transform.*;
 import javafx.util.Duration;
 
+import com.sun.javafx.css.converters.BooleanConverter;
+import com.sun.javafx.css.converters.PaintConverter;
+import com.sun.javafx.css.converters.SizeConverter;
+import com.sun.javafx.scene.control.skin.BehaviorSkinBase;
+
 @SuppressWarnings({"WeakerAccess", "SameReturnValue"})
 public class ConfidenceProgressIndicatorSkin extends BehaviorSkinBase<ConfidenceProgressIndicator,
         ConfidenceProgressIndicatorBehavior<ConfidenceProgressIndicator>> {
diff --git a/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java b/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java
index fb15bfc898..1d1a42a7e5 100644
--- a/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java
+++ b/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java
@@ -19,8 +19,7 @@ package io.bitsquare.gui.components.processbar;
 
 import java.util.List;
 
-import javafx.scene.control.Control;
-import javafx.scene.control.Skin;
+import javafx.scene.control.*;
 
 public class ProcessStepBar<T> extends Control {
 
diff --git a/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java b/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java
index 1617986c26..865038dcad 100644
--- a/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java
+++ b/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java
@@ -17,25 +17,22 @@
 
 package io.bitsquare.gui.components.processbar;
 
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-import com.sun.javafx.scene.control.behavior.KeyBinding;
-import com.sun.javafx.scene.control.skin.BehaviorSkinBase;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.layout.Border;
-import javafx.scene.layout.BorderStroke;
-import javafx.scene.layout.BorderStrokeStyle;
-import javafx.scene.layout.BorderWidths;
-import javafx.scene.paint.Color;
+import javafx.scene.*;
+import javafx.scene.control.*;
+import javafx.scene.layout.*;
+import javafx.scene.paint.*;
 import javafx.scene.shape.*;
 
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.behavior.KeyBinding;
+import com.sun.javafx.scene.control.skin.BehaviorSkinBase;
+
 class ProcessStepBarSkin<T> extends BehaviorSkinBase<ProcessStepBar<T>, BehaviorBase<ProcessStepBar<T>>> {
     private final ProcessStepBar<T> controller;
     private LabelWithBorder currentLabelWithBorder;
diff --git a/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java b/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java
index b530307920..853b6ac67a 100644
--- a/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java
+++ b/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java
@@ -18,7 +18,8 @@
 package io.bitsquare.gui.components.processbar;
 
 import io.bitsquare.gui.util.Colors;
-import javafx.scene.paint.Paint;
+
+import javafx.scene.paint.*;
 
 public class ProcessStepItem {
     private final String label;
diff --git a/src/main/java/io/bitsquare/gui/funds/FundsController.java b/src/main/java/io/bitsquare/gui/funds/FundsController.java
index c0ddfafe80..2671fddea2 100644
--- a/src/main/java/io/bitsquare/gui/funds/FundsController.java
+++ b/src/main/java/io/bitsquare/gui/funds/FundsController.java
@@ -24,7 +24,9 @@ import io.bitsquare.gui.components.CachingTabPane;
 import io.bitsquare.storage.Persistence;
 
 import java.net.URL;
+
 import java.util.ResourceBundle;
+
 import javax.inject.Inject;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/io/bitsquare/gui/funds/deposit/DepositController.java b/src/main/java/io/bitsquare/gui/funds/deposit/DepositController.java
index fdaca6b0cb..d7993912ea 100644
--- a/src/main/java/io/bitsquare/gui/funds/deposit/DepositController.java
+++ b/src/main/java/io/bitsquare/gui/funds/deposit/DepositController.java
@@ -17,27 +17,28 @@
 
 package io.bitsquare.gui.funds.deposit;
 
-import de.jensd.fx.fontawesome.AwesomeDude;
-import de.jensd.fx.fontawesome.AwesomeIcon;
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.gui.CachedViewController;
 
 import java.net.URL;
+
 import java.util.List;
 import java.util.ResourceBundle;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
-import javafx.scene.input.Clipboard;
-import javafx.scene.input.ClipboardContent;
+import javafx.scene.input.*;
 import javafx.util.Callback;
 
-import javax.inject.Inject;
+import de.jensd.fx.fontawesome.AwesomeDude;
+import de.jensd.fx.fontawesome.AwesomeIcon;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/bitsquare/gui/funds/transactions/TransactionsController.java b/src/main/java/io/bitsquare/gui/funds/transactions/TransactionsController.java
index 7fb96c5957..c6f288f943 100644
--- a/src/main/java/io/bitsquare/gui/funds/transactions/TransactionsController.java
+++ b/src/main/java/io/bitsquare/gui/funds/transactions/TransactionsController.java
@@ -17,15 +17,19 @@
 
 package io.bitsquare.gui.funds.transactions;
 
-import com.google.bitcoin.core.Transaction;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.gui.CachedViewController;
 
+import com.google.bitcoin.core.Transaction;
+
 import java.net.URL;
+
 import java.util.List;
 import java.util.ResourceBundle;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -33,8 +37,6 @@ import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.util.Callback;
 
-import javax.inject.Inject;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/funds/transactions/TransactionsListItem.java b/src/main/java/io/bitsquare/gui/funds/transactions/TransactionsListItem.java
index 7b1fe79804..7153a57d7e 100644
--- a/src/main/java/io/bitsquare/gui/funds/transactions/TransactionsListItem.java
+++ b/src/main/java/io/bitsquare/gui/funds/transactions/TransactionsListItem.java
@@ -17,14 +17,21 @@
 
 package io.bitsquare.gui.funds.transactions;
 
-import com.google.bitcoin.core.*;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.btc.listeners.ConfidenceListener;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
 import io.bitsquare.gui.util.BitSquareFormatter;
+
+import com.google.bitcoin.core.Address;
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.Transaction;
+import com.google.bitcoin.core.TransactionConfidence;
+import com.google.bitcoin.core.TransactionOutput;
+
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.scene.control.Tooltip;
+import javafx.scene.control.*;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalController.java b/src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalController.java
index 157a89d9cc..29f135dd11 100644
--- a/src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalController.java
+++ b/src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalController.java
@@ -17,13 +17,6 @@
 
 package io.bitsquare.gui.funds.withdrawal;
 
-import com.google.bitcoin.core.AddressFormatException;
-import com.google.bitcoin.core.Coin;
-import com.google.bitcoin.core.InsufficientMoneyException;
-import com.google.bitcoin.core.Transaction;
-import com.google.common.util.concurrent.FutureCallback;
-import de.jensd.fx.fontawesome.AwesomeDude;
-import de.jensd.fx.fontawesome.AwesomeIcon;
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.BtcValidator;
 import io.bitsquare.btc.FeePolicy;
@@ -33,24 +26,35 @@ import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.BitSquareFormatter;
 import io.bitsquare.gui.util.BitSquareValidator;
 
+import com.google.bitcoin.core.AddressFormatException;
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.InsufficientMoneyException;
+import com.google.bitcoin.core.Transaction;
+
+import com.google.common.util.concurrent.FutureCallback;
+
 import java.net.URL;
+
 import java.util.List;
 import java.util.ResourceBundle;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
-import javafx.scene.input.Clipboard;
-import javafx.scene.input.ClipboardContent;
+import javafx.scene.input.*;
 import javafx.util.Callback;
 
-import javax.inject.Inject;
+import de.jensd.fx.fontawesome.AwesomeDude;
+import de.jensd.fx.fontawesome.AwesomeIcon;
 
 import org.controlsfx.control.action.Action;
 import org.controlsfx.dialog.Dialog;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalListItem.java b/src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalListItem.java
index c3eed4c8cd..681a10e545 100644
--- a/src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalListItem.java
+++ b/src/main/java/io/bitsquare/gui/funds/withdrawal/WithdrawalListItem.java
@@ -17,18 +17,19 @@
 
 package io.bitsquare.gui.funds.withdrawal;
 
-import com.google.bitcoin.core.Address;
-import com.google.bitcoin.core.Coin;
-import com.google.bitcoin.core.TransactionConfidence;
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.btc.listeners.BalanceListener;
 import io.bitsquare.btc.listeners.ConfidenceListener;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
+
+import com.google.bitcoin.core.Address;
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.TransactionConfidence;
+
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.scene.control.Label;
-import javafx.scene.control.Tooltip;
+import javafx.scene.control.*;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/src/main/java/io/bitsquare/gui/home/HomeController.java b/src/main/java/io/bitsquare/gui/home/HomeController.java
index ae4cf0fdbd..eb5f53b7f7 100644
--- a/src/main/java/io/bitsquare/gui/home/HomeController.java
+++ b/src/main/java/io/bitsquare/gui/home/HomeController.java
@@ -25,12 +25,13 @@ import io.bitsquare.gui.ViewController;
 import io.bitsquare.gui.arbitrators.registration.ArbitratorRegistrationController;
 
 import java.io.IOException;
+
 import java.net.URL;
+
 import java.util.ResourceBundle;
 
 import javafx.fxml.FXML;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
+import javafx.scene.*;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
diff --git a/src/main/java/io/bitsquare/gui/msg/MsgController.java b/src/main/java/io/bitsquare/gui/msg/MsgController.java
index fe1a950f3a..67038fc002 100644
--- a/src/main/java/io/bitsquare/gui/msg/MsgController.java
+++ b/src/main/java/io/bitsquare/gui/msg/MsgController.java
@@ -22,7 +22,9 @@ import io.bitsquare.gui.NavigationItem;
 import io.bitsquare.gui.ViewController;
 
 import java.net.URL;
+
 import java.util.ResourceBundle;
+
 import javax.inject.Inject;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/io/bitsquare/gui/orders/OrdersController.java b/src/main/java/io/bitsquare/gui/orders/OrdersController.java
index f3df5ccbc9..4ce9279463 100644
--- a/src/main/java/io/bitsquare/gui/orders/OrdersController.java
+++ b/src/main/java/io/bitsquare/gui/orders/OrdersController.java
@@ -24,7 +24,9 @@ import io.bitsquare.gui.components.CachingTabPane;
 import io.bitsquare.storage.Persistence;
 
 import java.net.URL;
+
 import java.util.ResourceBundle;
+
 import javax.inject.Inject;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeController.java b/src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeController.java
index 50a7b29b0e..915da14f91 100644
--- a/src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeController.java
+++ b/src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeController.java
@@ -20,7 +20,9 @@ package io.bitsquare.gui.orders.closed;
 import io.bitsquare.gui.CachedViewController;
 
 import java.net.URL;
+
 import java.util.ResourceBundle;
+
 import javax.inject.Inject;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/io/bitsquare/gui/orders/offer/OfferController.java b/src/main/java/io/bitsquare/gui/orders/offer/OfferController.java
index cd97726d2b..950e75a0aa 100644
--- a/src/main/java/io/bitsquare/gui/orders/offer/OfferController.java
+++ b/src/main/java/io/bitsquare/gui/orders/offer/OfferController.java
@@ -23,22 +23,23 @@ import io.bitsquare.trade.Offer;
 import io.bitsquare.trade.TradeManager;
 
 import java.net.URL;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
-import javafx.scene.image.ImageView;
+import javafx.scene.image.*;
 import javafx.util.Callback;
 
-import javax.inject.Inject;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/orders/offer/OfferListItem.java b/src/main/java/io/bitsquare/gui/orders/offer/OfferListItem.java
index 5b87fc4b45..1129900d05 100644
--- a/src/main/java/io/bitsquare/gui/orders/offer/OfferListItem.java
+++ b/src/main/java/io/bitsquare/gui/orders/offer/OfferListItem.java
@@ -19,6 +19,7 @@ package io.bitsquare.gui.orders.offer;
 
 import io.bitsquare.gui.util.BitSquareFormatter;
 import io.bitsquare.trade.Offer;
+
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
diff --git a/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeController.java b/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeController.java
index 36387fbe22..f7e8543efa 100644
--- a/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeController.java
+++ b/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeController.java
@@ -17,10 +17,6 @@
 
 package io.bitsquare.gui.orders.pending;
 
-import com.google.bitcoin.core.*;
-import com.google.bitcoin.script.Script;
-import de.jensd.fx.fontawesome.AwesomeDude;
-import de.jensd.fx.fontawesome.AwesomeIcon;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.bank.BankAccountType;
 import io.bitsquare.btc.FeePolicy;
@@ -38,8 +34,23 @@ import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.TradeManager;
 import io.bitsquare.util.AWTSystemTray;
 
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.ECKey;
+import com.google.bitcoin.core.Transaction;
+import com.google.bitcoin.core.Wallet;
+import com.google.bitcoin.core.WalletEventListener;
+import com.google.bitcoin.script.Script;
+
 import java.net.URL;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.ResourceBundle;
+
+import javax.inject.Inject;
 
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;
@@ -48,14 +59,13 @@ import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.Clipboard;
-import javafx.scene.input.ClipboardContent;
-import javafx.scene.layout.HBox;
+import javafx.scene.image.*;
+import javafx.scene.input.*;
+import javafx.scene.layout.*;
 import javafx.util.Callback;
 
-import javax.inject.Inject;
+import de.jensd.fx.fontawesome.AwesomeDude;
+import de.jensd.fx.fontawesome.AwesomeIcon;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/bitsquare/gui/orders/pending/PendingTradesListItem.java b/src/main/java/io/bitsquare/gui/orders/pending/PendingTradesListItem.java
index 8987b5b22c..3722688ae2 100644
--- a/src/main/java/io/bitsquare/gui/orders/pending/PendingTradesListItem.java
+++ b/src/main/java/io/bitsquare/gui/orders/pending/PendingTradesListItem.java
@@ -19,6 +19,7 @@ package io.bitsquare.gui.orders.pending;
 
 import io.bitsquare.gui.trade.orderbook.OrderBookListItem;
 import io.bitsquare.trade.Trade;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/settings/SettingsController.java b/src/main/java/io/bitsquare/gui/settings/SettingsController.java
index a327115bf4..8d3df331b7 100644
--- a/src/main/java/io/bitsquare/gui/settings/SettingsController.java
+++ b/src/main/java/io/bitsquare/gui/settings/SettingsController.java
@@ -17,8 +17,6 @@
 
 package io.bitsquare.gui.settings;
 
-import com.google.bitcoin.core.ECKey;
-import com.google.bitcoin.core.Utils;
 import io.bitsquare.BitSquare;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.bank.BankAccountType;
@@ -29,7 +27,12 @@ import io.bitsquare.gui.ViewController;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.BitSquareValidator;
 import io.bitsquare.gui.util.ImageUtil;
-import io.bitsquare.locale.*;
+import io.bitsquare.locale.Country;
+import io.bitsquare.locale.CountryUtil;
+import io.bitsquare.locale.CurrencyUtil;
+import io.bitsquare.locale.LanguageUtil;
+import io.bitsquare.locale.Localisation;
+import io.bitsquare.locale.Region;
 import io.bitsquare.msg.MessageFacade;
 import io.bitsquare.settings.Settings;
 import io.bitsquare.storage.Persistence;
@@ -38,27 +41,35 @@ import io.bitsquare.user.Reputation;
 import io.bitsquare.user.User;
 import io.bitsquare.util.DSAKeyUtil;
 
+import com.google.bitcoin.core.ECKey;
+import com.google.bitcoin.core.Utils;
+
 import java.io.IOException;
+
 import java.net.URL;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Currency;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.ResourceBundle;
+
+import javax.inject.Inject;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
-import javafx.scene.Node;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
+import javafx.scene.*;
 import javafx.scene.control.*;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.HBox;
+import javafx.scene.image.*;
+import javafx.scene.layout.*;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
 
-import javax.inject.Inject;
-
 import org.controlsfx.control.action.Action;
 import org.controlsfx.dialog.Dialog;
 
diff --git a/src/main/java/io/bitsquare/gui/trade/TradeController.java b/src/main/java/io/bitsquare/gui/trade/TradeController.java
index 407891bbab..62d333db0b 100644
--- a/src/main/java/io/bitsquare/gui/trade/TradeController.java
+++ b/src/main/java/io/bitsquare/gui/trade/TradeController.java
@@ -28,13 +28,15 @@ import io.bitsquare.gui.trade.takeoffer.TakerOfferController;
 import io.bitsquare.trade.Direction;
 
 import java.io.IOException;
+
 import java.net.URL;
+
 import java.util.ResourceBundle;
 
 import javafx.application.Platform;
-import javafx.scene.Parent;
-import javafx.scene.control.Tab;
-import javafx.scene.control.TabPane;
+import javafx.scene.*;
+import javafx.scene.control.*;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferController.java b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferController.java
index 3903db785b..6877296152 100644
--- a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferController.java
+++ b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferController.java
@@ -41,23 +41,20 @@ import io.bitsquare.trade.orderbook.OrderBookFilter;
 import io.bitsquare.user.User;
 
 import java.net.URL;
+
 import java.util.Random;
 import java.util.ResourceBundle;
 import java.util.UUID;
 
+import javax.inject.Inject;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.TabPane;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.Region;
-
-import javax.inject.Inject;
+import javafx.scene.control.*;
+import javafx.scene.layout.*;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookController.java b/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookController.java
index 8389cb3614..f9a7437a49 100644
--- a/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookController.java
+++ b/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookController.java
@@ -17,10 +17,6 @@
 
 package io.bitsquare.gui.trade.orderbook;
 
-import com.google.bitcoin.core.Coin;
-import com.google.bitcoin.core.InsufficientMoneyException;
-import com.google.bitcoin.core.Transaction;
-import com.google.common.util.concurrent.FutureCallback;
 import io.bitsquare.bank.BankAccountType;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.WalletFacade;
@@ -46,30 +42,38 @@ import io.bitsquare.trade.orderbook.OrderBookFilter;
 import io.bitsquare.user.User;
 import io.bitsquare.util.Utilities;
 
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.InsufficientMoneyException;
+import com.google.bitcoin.core.Transaction;
+
+import com.google.common.util.concurrent.FutureCallback;
+
 import java.net.URL;
+
 import java.text.DecimalFormat;
 import java.text.ParseException;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
+import javax.inject.Inject;
+
 import javafx.animation.AnimationTimer;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.transformation.SortedList;
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.HBox;
+import javafx.scene.image.*;
+import javafx.scene.layout.*;
 import javafx.util.Callback;
 
-import javax.inject.Inject;
-
 import org.controlsfx.control.action.Action;
 import org.controlsfx.dialog.Dialog;
 import org.controlsfx.dialog.Dialogs;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookListItem.java b/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookListItem.java
index ad35cbeb92..fc63d59b24 100644
--- a/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookListItem.java
+++ b/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookListItem.java
@@ -19,6 +19,7 @@ package io.bitsquare.gui.trade.orderbook;
 
 import io.bitsquare.gui.util.BitSquareFormatter;
 import io.bitsquare.trade.Offer;
+
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
diff --git a/src/main/java/io/bitsquare/gui/trade/takeoffer/TakerOfferController.java b/src/main/java/io/bitsquare/gui/trade/takeoffer/TakerOfferController.java
index 3032a73875..b41ba923ce 100644
--- a/src/main/java/io/bitsquare/gui/trade/takeoffer/TakerOfferController.java
+++ b/src/main/java/io/bitsquare/gui/trade/takeoffer/TakerOfferController.java
@@ -17,7 +17,6 @@
 
 package io.bitsquare.gui.trade.takeoffer;
 
-import com.google.bitcoin.core.Coin;
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.WalletFacade;
@@ -33,14 +32,17 @@ import io.bitsquare.trade.TradeManager;
 import io.bitsquare.trade.protocol.taker.ProtocolForTakerAsSeller;
 import io.bitsquare.trade.protocol.taker.ProtocolForTakerAsSellerListener;
 
+import com.google.bitcoin.core.Coin;
+
 import java.net.URL;
+
 import java.util.ResourceBundle;
 
+import javax.inject.Inject;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 
-import javax.inject.Inject;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/util/BitSquareFormatter.java b/src/main/java/io/bitsquare/gui/util/BitSquareFormatter.java
index 26e6aeba62..43eeab18d2 100644
--- a/src/main/java/io/bitsquare/gui/util/BitSquareFormatter.java
+++ b/src/main/java/io/bitsquare/gui/util/BitSquareFormatter.java
@@ -17,14 +17,16 @@
 
 package io.bitsquare.gui.util;
 
-import com.google.bitcoin.core.Coin;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.Localisation;
 import io.bitsquare.trade.Direction;
 import io.bitsquare.user.Arbitrator;
 
+import com.google.bitcoin.core.Coin;
+
 import java.text.DateFormat;
 import java.text.DecimalFormat;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -32,8 +34,7 @@ import java.util.Locale;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.*;
 
 //TODO cleanup...
 public class BitSquareFormatter {
diff --git a/src/main/java/io/bitsquare/gui/util/BitSquareValidator.java b/src/main/java/io/bitsquare/gui/util/BitSquareValidator.java
index d00a554ad2..9e6419d4f4 100644
--- a/src/main/java/io/bitsquare/gui/util/BitSquareValidator.java
+++ b/src/main/java/io/bitsquare/gui/util/BitSquareValidator.java
@@ -17,14 +17,14 @@
 
 package io.bitsquare.gui.util;
 
-import com.google.bitcoin.core.Coin;
 import io.bitsquare.bank.BankAccountType;
 import io.bitsquare.trade.Offer;
-import javafx.scene.control.TextField;
-import javafx.scene.effect.BlurType;
-import javafx.scene.effect.DropShadow;
-import javafx.scene.effect.Effect;
-import javafx.scene.paint.Color;
+
+import com.google.bitcoin.core.Coin;
+
+import javafx.scene.control.*;
+import javafx.scene.effect.*;
+import javafx.scene.paint.*;
 
 //TODO to be removed
 @Deprecated
diff --git a/src/main/java/io/bitsquare/gui/util/Colors.java b/src/main/java/io/bitsquare/gui/util/Colors.java
index 3a3e669113..747e5329cb 100644
--- a/src/main/java/io/bitsquare/gui/util/Colors.java
+++ b/src/main/java/io/bitsquare/gui/util/Colors.java
@@ -17,8 +17,7 @@
 
 package io.bitsquare.gui.util;
 
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
+import javafx.scene.paint.*;
 
 public class Colors {
     public static final Paint YELLOW = Color.valueOf("#edc035");
diff --git a/src/main/java/io/bitsquare/gui/util/ConfidenceDisplay.java b/src/main/java/io/bitsquare/gui/util/ConfidenceDisplay.java
index 1911e4efa5..d7add26e75 100644
--- a/src/main/java/io/bitsquare/gui/util/ConfidenceDisplay.java
+++ b/src/main/java/io/bitsquare/gui/util/ConfidenceDisplay.java
@@ -17,15 +17,21 @@
 
 package io.bitsquare.gui.util;
 
-import com.google.bitcoin.core.*;
-import com.google.bitcoin.script.Script;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
 
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.ECKey;
+import com.google.bitcoin.core.Transaction;
+import com.google.bitcoin.core.TransactionConfidence;
+import com.google.bitcoin.core.Wallet;
+import com.google.bitcoin.core.WalletEventListener;
+import com.google.bitcoin.script.Script;
+
 import java.util.List;
 import java.util.Set;
 
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/util/ImageUtil.java b/src/main/java/io/bitsquare/gui/util/ImageUtil.java
index 118d694fbc..e64049f9ef 100644
--- a/src/main/java/io/bitsquare/gui/util/ImageUtil.java
+++ b/src/main/java/io/bitsquare/gui/util/ImageUtil.java
@@ -17,8 +17,7 @@
 
 package io.bitsquare.gui.util;
 
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
+import javafx.scene.image.*;
 
 public class ImageUtil {
     public static final String SPLASH_LOGO = "/images/logo_200_270.png";
diff --git a/src/main/java/io/bitsquare/gui/util/Profiler.java b/src/main/java/io/bitsquare/gui/util/Profiler.java
index c7a0d946b0..56e194b85f 100644
--- a/src/main/java/io/bitsquare/gui/util/Profiler.java
+++ b/src/main/java/io/bitsquare/gui/util/Profiler.java
@@ -22,6 +22,7 @@ import com.google.common.base.Stopwatch;
 import java.util.concurrent.TimeUnit;
 
 import javafx.animation.AnimationTimer;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/util/Transitions.java b/src/main/java/io/bitsquare/gui/util/Transitions.java
index 4ff82650ea..085577f4cc 100644
--- a/src/main/java/io/bitsquare/gui/util/Transitions.java
+++ b/src/main/java/io/bitsquare/gui/util/Transitions.java
@@ -17,12 +17,17 @@
 
 package io.bitsquare.gui.util;
 
-import javafx.animation.*;
+import javafx.animation.Animation;
+import javafx.animation.FadeTransition;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
 import javafx.application.Platform;
-import javafx.scene.Node;
-import javafx.scene.effect.GaussianBlur;
-import javafx.scene.layout.Pane;
+import javafx.scene.*;
+import javafx.scene.effect.*;
+import javafx.scene.layout.*;
 import javafx.util.Duration;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/gui/util/ValidationHelper.java b/src/main/java/io/bitsquare/gui/util/ValidationHelper.java
index 4bd31e90a0..b175fc71da 100644
--- a/src/main/java/io/bitsquare/gui/util/ValidationHelper.java
+++ b/src/main/java/io/bitsquare/gui/util/ValidationHelper.java
@@ -18,8 +18,10 @@
 package io.bitsquare.gui.util;
 
 import io.bitsquare.gui.components.ValidatingTextField;
+
 import javafx.beans.property.StringProperty;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/locale/Country.java b/src/main/java/io/bitsquare/locale/Country.java
index 876d06538e..cda2408270 100644
--- a/src/main/java/io/bitsquare/locale/Country.java
+++ b/src/main/java/io/bitsquare/locale/Country.java
@@ -18,6 +18,7 @@
 package io.bitsquare.locale;
 
 import java.io.Serializable;
+
 import java.util.Objects;
 
 public class Country implements Serializable {
diff --git a/src/main/java/io/bitsquare/locale/CountryUtil.java b/src/main/java/io/bitsquare/locale/CountryUtil.java
index 78d06f7bc8..63b9278c26 100644
--- a/src/main/java/io/bitsquare/locale/CountryUtil.java
+++ b/src/main/java/io/bitsquare/locale/CountryUtil.java
@@ -20,7 +20,11 @@ package io.bitsquare.locale;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 public class CountryUtil {
diff --git a/src/main/java/io/bitsquare/locale/CurrencyUtil.java b/src/main/java/io/bitsquare/locale/CurrencyUtil.java
index d5db96e0ee..ce948a32f3 100644
--- a/src/main/java/io/bitsquare/locale/CurrencyUtil.java
+++ b/src/main/java/io/bitsquare/locale/CurrencyUtil.java
@@ -18,7 +18,12 @@
 package io.bitsquare.locale;
 
 import java.text.NumberFormat;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Currency;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
 
 public class CurrencyUtil {
 
diff --git a/src/main/java/io/bitsquare/locale/LanguageUtil.java b/src/main/java/io/bitsquare/locale/LanguageUtil.java
index 999c02b983..2290347598 100644
--- a/src/main/java/io/bitsquare/locale/LanguageUtil.java
+++ b/src/main/java/io/bitsquare/locale/LanguageUtil.java
@@ -17,7 +17,11 @@
 
 package io.bitsquare.locale;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 public class LanguageUtil {
diff --git a/src/main/java/io/bitsquare/locale/Localisation.java b/src/main/java/io/bitsquare/locale/Localisation.java
index b2701f5fb6..9ee225a24c 100644
--- a/src/main/java/io/bitsquare/locale/Localisation.java
+++ b/src/main/java/io/bitsquare/locale/Localisation.java
@@ -20,9 +20,12 @@ package io.bitsquare.locale;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+
 import java.net.URL;
 import java.net.URLConnection;
+
 import java.text.MessageFormat;
+
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.PropertyResourceBundle;
diff --git a/src/main/java/io/bitsquare/locale/Region.java b/src/main/java/io/bitsquare/locale/Region.java
index 1b0a934774..49982ff498 100644
--- a/src/main/java/io/bitsquare/locale/Region.java
+++ b/src/main/java/io/bitsquare/locale/Region.java
@@ -18,6 +18,7 @@
 package io.bitsquare.locale;
 
 import java.io.Serializable;
+
 import java.util.Objects;
 
 public class Region implements Serializable {
diff --git a/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java b/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java
index 992394f0be..c88bc64585 100644
--- a/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java
+++ b/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java
@@ -17,16 +17,22 @@
 
 package io.bitsquare.msg;
 
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
-import com.google.inject.name.Named;
 import io.bitsquare.storage.Persistence;
 
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
+
+import com.google.inject.name.Named;
+
 import java.io.IOException;
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+
 import java.security.KeyPair;
+
 import javax.annotation.concurrent.Immutable;
+
 import javax.inject.Inject;
 
 import net.tomp2p.connection.Ports;
@@ -49,7 +55,9 @@ import net.tomp2p.peers.PeerStatatistic;
 import net.tomp2p.relay.DistributedRelay;
 import net.tomp2p.relay.FutureRelay;
 import net.tomp2p.storage.Storage;
+
 import org.jetbrains.annotations.NotNull;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/msg/MessageFacade.java b/src/main/java/io/bitsquare/msg/MessageFacade.java
index 26a52dd493..7cb0448fa1 100644
--- a/src/main/java/io/bitsquare/msg/MessageFacade.java
+++ b/src/main/java/io/bitsquare/msg/MessageFacade.java
@@ -17,27 +17,35 @@
 
 package io.bitsquare.msg;
 
-import com.google.common.util.concurrent.FutureCallback;
-import io.bitsquare.msg.listeners.*;
+import io.bitsquare.msg.listeners.ArbitratorListener;
+import io.bitsquare.msg.listeners.GetPeerAddressListener;
+import io.bitsquare.msg.listeners.IncomingTradeMessageListener;
+import io.bitsquare.msg.listeners.OrderBookListener;
+import io.bitsquare.msg.listeners.OutgoingTradeMessageListener;
 import io.bitsquare.trade.Offer;
 import io.bitsquare.trade.protocol.TradeMessage;
 import io.bitsquare.user.Arbitrator;
 import io.bitsquare.user.User;
 
+import com.google.common.util.concurrent.FutureCallback;
+
 import java.io.IOException;
+
 import java.security.PublicKey;
+
 import java.util.ArrayList;
 import java.util.Currency;
 import java.util.List;
 import java.util.Locale;
 
+import javax.annotation.Nullable;
+
+import javax.inject.Inject;
+
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
 import net.tomp2p.dht.FutureGet;
 import net.tomp2p.dht.FuturePut;
 import net.tomp2p.dht.FutureRemove;
@@ -50,6 +58,7 @@ import net.tomp2p.peers.Number160;
 import net.tomp2p.peers.PeerAddress;
 import net.tomp2p.storage.Data;
 import net.tomp2p.utils.Utils;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/msg/P2PNode.java b/src/main/java/io/bitsquare/msg/P2PNode.java
index 29b0b2702f..3610ddef81 100644
--- a/src/main/java/io/bitsquare/msg/P2PNode.java
+++ b/src/main/java/io/bitsquare/msg/P2PNode.java
@@ -17,24 +17,34 @@
 
 package io.bitsquare.msg;
 
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.inject.name.Named;
 import io.bitsquare.BitSquare;
 import io.bitsquare.util.StorageDirectory;
 
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+
+import com.google.inject.name.Named;
+
 import java.io.File;
 import java.io.IOException;
+
 import java.security.KeyPair;
 import java.security.PublicKey;
+
 import java.util.Timer;
 import java.util.TimerTask;
+
 import javax.annotation.Nullable;
+
 import javax.inject.Inject;
 
 import net.tomp2p.connection.DSASignatureFactory;
-import net.tomp2p.dht.*;
+import net.tomp2p.dht.FutureGet;
+import net.tomp2p.dht.FuturePut;
+import net.tomp2p.dht.FutureRemove;
+import net.tomp2p.dht.PeerDHT;
+import net.tomp2p.dht.StorageMemory;
 import net.tomp2p.futures.BaseFuture;
 import net.tomp2p.futures.BaseFutureListener;
 import net.tomp2p.futures.FutureDirect;
@@ -45,7 +55,9 @@ import net.tomp2p.storage.Data;
 import net.tomp2p.storage.Storage;
 import net.tomp2p.storage.StorageDisk;
 import net.tomp2p.utils.Utils;
+
 import org.jetbrains.annotations.NotNull;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/msg/listeners/IncomingTradeMessageListener.java b/src/main/java/io/bitsquare/msg/listeners/IncomingTradeMessageListener.java
index cd69672f21..ebc623d16e 100644
--- a/src/main/java/io/bitsquare/msg/listeners/IncomingTradeMessageListener.java
+++ b/src/main/java/io/bitsquare/msg/listeners/IncomingTradeMessageListener.java
@@ -18,6 +18,7 @@
 package io.bitsquare.msg.listeners;
 
 import io.bitsquare.trade.protocol.TradeMessage;
+
 import net.tomp2p.peers.PeerAddress;
 
 public interface IncomingTradeMessageListener {
diff --git a/src/main/java/io/bitsquare/settings/Settings.java b/src/main/java/io/bitsquare/settings/Settings.java
index 78ea0f1b34..1ea57acb0d 100644
--- a/src/main/java/io/bitsquare/settings/Settings.java
+++ b/src/main/java/io/bitsquare/settings/Settings.java
@@ -17,11 +17,13 @@
 
 package io.bitsquare.settings;
 
-import com.google.bitcoin.core.Coin;
 import io.bitsquare.locale.Country;
 import io.bitsquare.user.Arbitrator;
 
+import com.google.bitcoin.core.Coin;
+
 import java.io.Serializable;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
diff --git a/src/main/java/io/bitsquare/storage/Persistence.java b/src/main/java/io/bitsquare/storage/Persistence.java
index 4e2fea6626..91b6c90353 100644
--- a/src/main/java/io/bitsquare/storage/Persistence.java
+++ b/src/main/java/io/bitsquare/storage/Persistence.java
@@ -17,16 +17,27 @@
 
 package io.bitsquare.storage;
 
-import com.google.bitcoin.utils.Threading;
 import io.bitsquare.BitSquare;
 import io.bitsquare.util.FileUtil;
 
-import java.io.*;
+import com.google.bitcoin.utils.Threading;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
+
 import javax.annotation.concurrent.GuardedBy;
+
 import javax.inject.Inject;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/io/bitsquare/trade/Contract.java b/src/main/java/io/bitsquare/trade/Contract.java
index 0791eb74b0..c932c485e3 100644
--- a/src/main/java/io/bitsquare/trade/Contract.java
+++ b/src/main/java/io/bitsquare/trade/Contract.java
@@ -17,11 +17,13 @@
 
 package io.bitsquare.trade;
 
-import com.google.bitcoin.core.Coin;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.util.DSAKeyUtil;
 
+import com.google.bitcoin.core.Coin;
+
 import java.io.Serializable;
+
 import java.security.PublicKey;
 
 public class Contract implements Serializable {
diff --git a/src/main/java/io/bitsquare/trade/Offer.java b/src/main/java/io/bitsquare/trade/Offer.java
index 46fab1f65e..6f5e1a1954 100644
--- a/src/main/java/io/bitsquare/trade/Offer.java
+++ b/src/main/java/io/bitsquare/trade/Offer.java
@@ -17,15 +17,22 @@
 
 package io.bitsquare.trade;
 
-import com.google.bitcoin.core.Coin;
 import io.bitsquare.bank.BankAccountType;
 import io.bitsquare.locale.Country;
 import io.bitsquare.user.Arbitrator;
 
+import com.google.bitcoin.core.Coin;
+
 import java.io.Serializable;
+
 import java.math.BigDecimal;
+
 import java.security.PublicKey;
-import java.util.*;
+
+import java.util.Currency;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
 
 public class Offer implements Serializable {
     private static final long serialVersionUID = -971164804305475826L;
diff --git a/src/main/java/io/bitsquare/trade/TradeManager.java b/src/main/java/io/bitsquare/trade/TradeManager.java
index 953c37c772..5ea5dee9fb 100644
--- a/src/main/java/io/bitsquare/trade/TradeManager.java
+++ b/src/main/java/io/bitsquare/trade/TradeManager.java
@@ -17,10 +17,6 @@
 
 package io.bitsquare.trade;
 
-import com.google.bitcoin.core.Coin;
-import com.google.bitcoin.core.Transaction;
-import com.google.bitcoin.core.TransactionConfidence;
-import com.google.bitcoin.core.Utils;
 import io.bitsquare.btc.BlockChainFacade;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.crypto.CryptoFacade;
@@ -33,23 +29,41 @@ import io.bitsquare.trade.handlers.ErrorMessageHandler;
 import io.bitsquare.trade.handlers.TransactionResultHandler;
 import io.bitsquare.trade.protocol.TradeMessage;
 import io.bitsquare.trade.protocol.createoffer.CreateOfferCoordinator;
-import io.bitsquare.trade.protocol.offerer.*;
-import io.bitsquare.trade.protocol.taker.*;
+import io.bitsquare.trade.protocol.offerer.BankTransferInitedMessage;
+import io.bitsquare.trade.protocol.offerer.DepositTxPublishedMessage;
+import io.bitsquare.trade.protocol.offerer.ProtocolForOffererAsBuyer;
+import io.bitsquare.trade.protocol.offerer.ProtocolForOffererAsBuyerListener;
+import io.bitsquare.trade.protocol.offerer.RequestTakerDepositPaymentMessage;
+import io.bitsquare.trade.protocol.offerer.RespondToTakeOfferRequestMessage;
+import io.bitsquare.trade.protocol.taker.PayoutTxPublishedMessage;
+import io.bitsquare.trade.protocol.taker.ProtocolForTakerAsSeller;
+import io.bitsquare.trade.protocol.taker.ProtocolForTakerAsSellerListener;
+import io.bitsquare.trade.protocol.taker.RequestOffererPublishDepositTxMessage;
+import io.bitsquare.trade.protocol.taker.RequestTakeOfferMessage;
+import io.bitsquare.trade.protocol.taker.TakeOfferFeePayedMessage;
 import io.bitsquare.user.User;
 
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.Transaction;
+import com.google.bitcoin.core.TransactionConfidence;
+import com.google.bitcoin.core.Utils;
+
 import java.io.IOException;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
-import javax.inject.Inject;
-
 import net.tomp2p.peers.PeerAddress;
+
 import org.jetbrains.annotations.Nullable;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java b/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java
index 73769dbc67..f52d928dff 100644
--- a/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java
+++ b/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java
@@ -31,19 +31,21 @@ import io.bitsquare.user.Arbitrator;
 import io.bitsquare.user.User;
 
 import java.io.IOException;
+
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
 import javafx.collections.transformation.SortedList;
 
-import javax.inject.Inject;
-
 import net.tomp2p.peers.Number640;
 import net.tomp2p.storage.Data;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/orderbook/OrderBookFilter.java b/src/main/java/io/bitsquare/trade/orderbook/OrderBookFilter.java
index 33ea59013b..1ba5b15609 100644
--- a/src/main/java/io/bitsquare/trade/orderbook/OrderBookFilter.java
+++ b/src/main/java/io/bitsquare/trade/orderbook/OrderBookFilter.java
@@ -17,8 +17,10 @@
 
 package io.bitsquare.trade.orderbook;
 
-import com.google.bitcoin.core.Coin;
 import io.bitsquare.trade.Direction;
+
+import com.google.bitcoin.core.Coin;
+
 import javafx.beans.property.SimpleBooleanProperty;
 
 public class OrderBookFilter {
diff --git a/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java b/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java
index f97e09a49f..6d2d0626df 100644
--- a/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java
+++ b/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java
@@ -17,7 +17,6 @@
 
 package io.bitsquare.trade.protocol.createoffer;
 
-import com.google.bitcoin.core.Transaction;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.msg.MessageFacade;
 import io.bitsquare.storage.Persistence;
@@ -29,7 +28,10 @@ import io.bitsquare.trade.protocol.createoffer.tasks.CreateOfferFeeTx;
 import io.bitsquare.trade.protocol.createoffer.tasks.PublishOfferToDHT;
 import io.bitsquare.trade.protocol.createoffer.tasks.ValidateOffer;
 
+import com.google.bitcoin.core.Transaction;
+
 import java.io.Serializable;
+
 import javax.annotation.concurrent.Immutable;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/BroadCastOfferFeeTx.java b/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/BroadCastOfferFeeTx.java
index bf7d211013..262eb6440d 100644
--- a/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/BroadCastOfferFeeTx.java
+++ b/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/BroadCastOfferFeeTx.java
@@ -17,13 +17,17 @@
 
 package io.bitsquare.trade.protocol.createoffer.tasks;
 
-import com.google.bitcoin.core.InsufficientMoneyException;
-import com.google.bitcoin.core.Transaction;
-import com.google.common.util.concurrent.FutureCallback;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.trade.handlers.FaultHandler;
 import io.bitsquare.trade.handlers.ResultHandler;
+
+import com.google.bitcoin.core.InsufficientMoneyException;
+import com.google.bitcoin.core.Transaction;
+
+import com.google.common.util.concurrent.FutureCallback;
+
 import org.jetbrains.annotations.NotNull;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/CreateOfferFeeTx.java b/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/CreateOfferFeeTx.java
index 3739c31623..50ae14cddc 100644
--- a/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/CreateOfferFeeTx.java
+++ b/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/CreateOfferFeeTx.java
@@ -17,10 +17,12 @@
 
 package io.bitsquare.trade.protocol.createoffer.tasks;
 
-import com.google.bitcoin.core.InsufficientMoneyException;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.trade.handlers.FaultHandler;
 import io.bitsquare.trade.handlers.TransactionResultHandler;
+
+import com.google.bitcoin.core.InsufficientMoneyException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/PublishOfferToDHT.java b/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/PublishOfferToDHT.java
index d75997b521..e9f65cbd5d 100644
--- a/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/PublishOfferToDHT.java
+++ b/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/PublishOfferToDHT.java
@@ -21,6 +21,7 @@ import io.bitsquare.msg.MessageFacade;
 import io.bitsquare.trade.Offer;
 import io.bitsquare.trade.handlers.FaultHandler;
 import io.bitsquare.trade.handlers.ResultHandler;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/ValidateOffer.java b/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/ValidateOffer.java
index 8b7c54cc13..b960eef7ee 100644
--- a/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/ValidateOffer.java
+++ b/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/ValidateOffer.java
@@ -17,20 +17,20 @@
 
 package io.bitsquare.trade.protocol.createoffer.tasks;
 
-import com.google.bitcoin.core.Coin;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.Restritions;
 import io.bitsquare.trade.Offer;
 import io.bitsquare.trade.handlers.FaultHandler;
 import io.bitsquare.trade.handlers.ResultHandler;
 
+import com.google.bitcoin.core.Coin;
+
 import javax.annotation.concurrent.Immutable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.*;
 
 @Immutable
 public class ValidateOffer {
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/BankTransferInitedMessage.java b/src/main/java/io/bitsquare/trade/protocol/offerer/BankTransferInitedMessage.java
index ba562196aa..7b5d49db68 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/BankTransferInitedMessage.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/BankTransferInitedMessage.java
@@ -17,9 +17,10 @@
 
 package io.bitsquare.trade.protocol.offerer;
 
-import com.google.bitcoin.core.Coin;
 import io.bitsquare.trade.protocol.TradeMessage;
 
+import com.google.bitcoin.core.Coin;
+
 import java.io.Serializable;
 
 public class BankTransferInitedMessage implements Serializable, TradeMessage {
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/CreateDepositTx.java b/src/main/java/io/bitsquare/trade/protocol/offerer/CreateDepositTx.java
index a8a5a75966..ac792fee93 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/CreateDepositTx.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/CreateDepositTx.java
@@ -17,12 +17,14 @@
 
 package io.bitsquare.trade.protocol.offerer;
 
+import io.bitsquare.btc.WalletFacade;
+import io.bitsquare.trade.handlers.ExceptionHandler;
+
 import com.google.bitcoin.core.Coin;
 import com.google.bitcoin.core.InsufficientMoneyException;
 import com.google.bitcoin.core.Transaction;
 import com.google.bitcoin.core.Utils;
-import io.bitsquare.btc.WalletFacade;
-import io.bitsquare.trade.handlers.ExceptionHandler;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/HandleTakeOfferRequest.java b/src/main/java/io/bitsquare/trade/protocol/offerer/HandleTakeOfferRequest.java
index 230ce23850..91dbdbb7e8 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/HandleTakeOfferRequest.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/HandleTakeOfferRequest.java
@@ -21,7 +21,9 @@ import io.bitsquare.msg.MessageFacade;
 import io.bitsquare.msg.listeners.OutgoingTradeMessageListener;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.handlers.ExceptionHandler;
+
 import net.tomp2p.peers.PeerAddress;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/ProtocolForOffererAsBuyer.java b/src/main/java/io/bitsquare/trade/protocol/offerer/ProtocolForOffererAsBuyer.java
index a2bfac51fa..e1ea294982 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/ProtocolForOffererAsBuyer.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/ProtocolForOffererAsBuyer.java
@@ -17,9 +17,6 @@
 
 package io.bitsquare.trade.protocol.offerer;
 
-import com.google.bitcoin.core.Coin;
-import com.google.bitcoin.core.ECKey;
-import com.google.bitcoin.core.Transaction;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.btc.BlockChainFacade;
 import io.bitsquare.btc.FeePolicy;
@@ -34,10 +31,16 @@ import io.bitsquare.trade.protocol.taker.RequestOffererPublishDepositTxMessage;
 import io.bitsquare.trade.protocol.taker.TakeOfferFeePayedMessage;
 import io.bitsquare.user.User;
 
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.ECKey;
+import com.google.bitcoin.core.Transaction;
+
 import java.security.PublicKey;
 
 import net.tomp2p.peers.PeerAddress;
+
 import org.jetbrains.annotations.NotNull;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/ProtocolForOffererAsBuyerListener.java b/src/main/java/io/bitsquare/trade/protocol/offerer/ProtocolForOffererAsBuyerListener.java
index 769689deaf..db3f04951c 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/ProtocolForOffererAsBuyerListener.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/ProtocolForOffererAsBuyerListener.java
@@ -17,9 +17,10 @@
 
 package io.bitsquare.trade.protocol.offerer;
 
-import com.google.bitcoin.core.TransactionConfidence;
 import io.bitsquare.trade.Offer;
 
+import com.google.bitcoin.core.TransactionConfidence;
+
 public interface ProtocolForOffererAsBuyerListener {
     void onOfferAccepted(Offer offer);
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/RequestTakerDepositPayment.java b/src/main/java/io/bitsquare/trade/protocol/offerer/RequestTakerDepositPayment.java
index 10e2fc9f7f..910483166e 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/RequestTakerDepositPayment.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/RequestTakerDepositPayment.java
@@ -22,7 +22,9 @@ import io.bitsquare.msg.MessageFacade;
 import io.bitsquare.msg.listeners.OutgoingTradeMessageListener;
 import io.bitsquare.trade.handlers.ExceptionHandler;
 import io.bitsquare.trade.handlers.ResultHandler;
+
 import net.tomp2p.peers.PeerAddress;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/SendDepositTxIdToTaker.java b/src/main/java/io/bitsquare/trade/protocol/offerer/SendDepositTxIdToTaker.java
index c246b80a69..302c23d704 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/SendDepositTxIdToTaker.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/SendDepositTxIdToTaker.java
@@ -17,13 +17,16 @@
 
 package io.bitsquare.trade.protocol.offerer;
 
-import com.google.bitcoin.core.Transaction;
-import com.google.bitcoin.core.Utils;
 import io.bitsquare.msg.MessageFacade;
 import io.bitsquare.msg.listeners.OutgoingTradeMessageListener;
 import io.bitsquare.trade.handlers.ExceptionHandler;
 import io.bitsquare.trade.handlers.ResultHandler;
+
+import com.google.bitcoin.core.Transaction;
+import com.google.bitcoin.core.Utils;
+
 import net.tomp2p.peers.PeerAddress;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/SendSignedPayoutTx.java b/src/main/java/io/bitsquare/trade/protocol/offerer/SendSignedPayoutTx.java
index 2a2ff5a3aa..b00ed0a43b 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/SendSignedPayoutTx.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/SendSignedPayoutTx.java
@@ -17,15 +17,19 @@
 
 package io.bitsquare.trade.protocol.offerer;
 
-import com.google.bitcoin.core.Coin;
-import com.google.bitcoin.core.ECKey;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.msg.MessageFacade;
 import io.bitsquare.msg.listeners.OutgoingTradeMessageListener;
 import io.bitsquare.trade.handlers.ExceptionHandler;
 import io.bitsquare.trade.handlers.ResultHandler;
+
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.ECKey;
+
 import javafx.util.Pair;
+
 import net.tomp2p.peers.PeerAddress;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/SetupListenerForBlockChainConfirmation.java b/src/main/java/io/bitsquare/trade/protocol/offerer/SetupListenerForBlockChainConfirmation.java
index 69dbfe2a69..1e2d8a4f0c 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/SetupListenerForBlockChainConfirmation.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/SetupListenerForBlockChainConfirmation.java
@@ -17,10 +17,12 @@
 
 package io.bitsquare.trade.protocol.offerer;
 
-import com.google.bitcoin.core.Transaction;
-import com.google.bitcoin.core.TransactionConfidence;
 import io.bitsquare.trade.handlers.ExceptionHandler;
 import io.bitsquare.trade.handlers.ResultHandler;
+
+import com.google.bitcoin.core.Transaction;
+import com.google.bitcoin.core.TransactionConfidence;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/SignAndPublishDepositTx.java b/src/main/java/io/bitsquare/trade/protocol/offerer/SignAndPublishDepositTx.java
index bd61d13dc5..83689b928a 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/SignAndPublishDepositTx.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/SignAndPublishDepositTx.java
@@ -17,10 +17,13 @@
 
 package io.bitsquare.trade.protocol.offerer;
 
-import com.google.bitcoin.core.Transaction;
-import com.google.common.util.concurrent.FutureCallback;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.trade.handlers.ExceptionHandler;
+
+import com.google.bitcoin.core.Transaction;
+
+import com.google.common.util.concurrent.FutureCallback;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyAndSignContract.java b/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyAndSignContract.java
index 13d0b01ccf..f486540bf2 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyAndSignContract.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyAndSignContract.java
@@ -17,8 +17,6 @@
 
 package io.bitsquare.trade.protocol.offerer;
 
-import com.google.bitcoin.core.Coin;
-import com.google.bitcoin.core.ECKey;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.crypto.CryptoFacade;
 import io.bitsquare.trade.Contract;
@@ -26,6 +24,9 @@ import io.bitsquare.trade.Offer;
 import io.bitsquare.trade.handlers.ExceptionHandler;
 import io.bitsquare.util.Utilities;
 
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.ECKey;
+
 import java.security.PublicKey;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyTakeOfferFeePayment.java b/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyTakeOfferFeePayment.java
index fdcaa8aa14..c19d51180d 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyTakeOfferFeePayment.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyTakeOfferFeePayment.java
@@ -20,6 +20,7 @@ package io.bitsquare.trade.protocol.offerer;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.trade.handlers.ExceptionHandler;
 import io.bitsquare.trade.handlers.ResultHandler;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyTakerAccount.java b/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyTakerAccount.java
index 320dcaa8cd..2442f0e1cd 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyTakerAccount.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/VerifyTakerAccount.java
@@ -22,6 +22,7 @@ import io.bitsquare.btc.BlockChainFacade;
 import io.bitsquare.trade.handlers.ExceptionHandler;
 import io.bitsquare.trade.handlers.ResultHandler;
 import io.bitsquare.trade.protocol.shared.VerifyPeerAccount;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/shared/VerifyPeerAccount.java b/src/main/java/io/bitsquare/trade/protocol/shared/VerifyPeerAccount.java
index 7b4b96eccd..142b107361 100644
--- a/src/main/java/io/bitsquare/trade/protocol/shared/VerifyPeerAccount.java
+++ b/src/main/java/io/bitsquare/trade/protocol/shared/VerifyPeerAccount.java
@@ -21,6 +21,7 @@ import io.bitsquare.bank.BankAccount;
 import io.bitsquare.btc.BlockChainFacade;
 import io.bitsquare.trade.handlers.ExceptionHandler;
 import io.bitsquare.trade.handlers.ResultHandler;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/CreateAndSignContract.java b/src/main/java/io/bitsquare/trade/protocol/taker/CreateAndSignContract.java
index 75498aa22d..c86cbab6a9 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/CreateAndSignContract.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/CreateAndSignContract.java
@@ -17,8 +17,6 @@
 
 package io.bitsquare.trade.protocol.taker;
 
-import com.google.bitcoin.core.Coin;
-import com.google.bitcoin.core.ECKey;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.crypto.CryptoFacade;
 import io.bitsquare.trade.Contract;
@@ -26,6 +24,9 @@ import io.bitsquare.trade.Offer;
 import io.bitsquare.trade.handlers.ExceptionHandler;
 import io.bitsquare.util.Utilities;
 
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.ECKey;
+
 import java.security.PublicKey;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/GetPeerAddress.java b/src/main/java/io/bitsquare/trade/protocol/taker/GetPeerAddress.java
index 27c4f7a72b..0b8fb1ba1a 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/GetPeerAddress.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/GetPeerAddress.java
@@ -24,6 +24,7 @@ import io.bitsquare.trade.handlers.ExceptionHandler;
 import java.security.PublicKey;
 
 import net.tomp2p.peers.PeerAddress;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/PayDeposit.java b/src/main/java/io/bitsquare/trade/protocol/taker/PayDeposit.java
index 1231391cce..09ccb8f053 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/PayDeposit.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/PayDeposit.java
@@ -17,11 +17,13 @@
 
 package io.bitsquare.trade.protocol.taker;
 
+import io.bitsquare.btc.WalletFacade;
+import io.bitsquare.trade.handlers.ExceptionHandler;
+
 import com.google.bitcoin.core.Coin;
 import com.google.bitcoin.core.InsufficientMoneyException;
 import com.google.bitcoin.core.Transaction;
-import io.bitsquare.btc.WalletFacade;
-import io.bitsquare.trade.handlers.ExceptionHandler;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/PayTakeOfferFee.java b/src/main/java/io/bitsquare/trade/protocol/taker/PayTakeOfferFee.java
index d8c6bafabf..bec3f557ff 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/PayTakeOfferFee.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/PayTakeOfferFee.java
@@ -17,11 +17,14 @@
 
 package io.bitsquare.trade.protocol.taker;
 
-import com.google.bitcoin.core.InsufficientMoneyException;
-import com.google.bitcoin.core.Transaction;
-import com.google.common.util.concurrent.FutureCallback;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.trade.handlers.ExceptionHandler;
+
+import com.google.bitcoin.core.InsufficientMoneyException;
+import com.google.bitcoin.core.Transaction;
+
+import com.google.common.util.concurrent.FutureCallback;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/ProtocolForTakerAsSeller.java b/src/main/java/io/bitsquare/trade/protocol/taker/ProtocolForTakerAsSeller.java
index fcdeb2e26e..614d295694 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/ProtocolForTakerAsSeller.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/ProtocolForTakerAsSeller.java
@@ -17,9 +17,6 @@
 
 package io.bitsquare.trade.protocol.taker;
 
-import com.google.bitcoin.core.Coin;
-import com.google.bitcoin.core.ECKey;
-import com.google.bitcoin.core.Transaction;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.btc.BlockChainFacade;
 import io.bitsquare.btc.WalletFacade;
@@ -34,9 +31,14 @@ import io.bitsquare.trade.protocol.offerer.RequestTakerDepositPaymentMessage;
 import io.bitsquare.trade.protocol.offerer.RespondToTakeOfferRequestMessage;
 import io.bitsquare.user.User;
 
+import com.google.bitcoin.core.Coin;
+import com.google.bitcoin.core.ECKey;
+import com.google.bitcoin.core.Transaction;
+
 import java.security.PublicKey;
 
 import net.tomp2p.peers.PeerAddress;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/RequestOffererPublishDepositTxMessage.java b/src/main/java/io/bitsquare/trade/protocol/taker/RequestOffererPublishDepositTxMessage.java
index b883a062cf..484b9d88a9 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/RequestOffererPublishDepositTxMessage.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/RequestOffererPublishDepositTxMessage.java
@@ -21,6 +21,7 @@ import io.bitsquare.bank.BankAccount;
 import io.bitsquare.trade.protocol.TradeMessage;
 
 import java.io.Serializable;
+
 import java.security.PublicKey;
 
 public class RequestOffererPublishDepositTxMessage implements Serializable, TradeMessage {
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/RequestTakeOffer.java b/src/main/java/io/bitsquare/trade/protocol/taker/RequestTakeOffer.java
index f8fa5b14b5..d419574be6 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/RequestTakeOffer.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/RequestTakeOffer.java
@@ -21,7 +21,9 @@ import io.bitsquare.msg.MessageFacade;
 import io.bitsquare.msg.listeners.OutgoingTradeMessageListener;
 import io.bitsquare.trade.handlers.ExceptionHandler;
 import io.bitsquare.trade.handlers.ResultHandler;
+
 import net.tomp2p.peers.PeerAddress;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/SendPayoutTxToOfferer.java b/src/main/java/io/bitsquare/trade/protocol/taker/SendPayoutTxToOfferer.java
index 8807ec79df..d8de515b9f 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/SendPayoutTxToOfferer.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/SendPayoutTxToOfferer.java
@@ -21,7 +21,9 @@ import io.bitsquare.msg.MessageFacade;
 import io.bitsquare.msg.listeners.OutgoingTradeMessageListener;
 import io.bitsquare.trade.handlers.ExceptionHandler;
 import io.bitsquare.trade.handlers.ResultHandler;
+
 import net.tomp2p.peers.PeerAddress;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/SendSignedTakerDepositTxAsHex.java b/src/main/java/io/bitsquare/trade/protocol/taker/SendSignedTakerDepositTxAsHex.java
index 8bcc5f81c1..7aa8b81aef 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/SendSignedTakerDepositTxAsHex.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/SendSignedTakerDepositTxAsHex.java
@@ -17,8 +17,6 @@
 
 package io.bitsquare.trade.protocol.taker;
 
-import com.google.bitcoin.core.Transaction;
-import com.google.bitcoin.core.Utils;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.msg.MessageFacade;
@@ -26,9 +24,13 @@ import io.bitsquare.msg.listeners.OutgoingTradeMessageListener;
 import io.bitsquare.trade.handlers.ExceptionHandler;
 import io.bitsquare.trade.handlers.ResultHandler;
 
+import com.google.bitcoin.core.Transaction;
+import com.google.bitcoin.core.Utils;
+
 import java.security.PublicKey;
 
 import net.tomp2p.peers.PeerAddress;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/SendTakeOfferFeePayedTxId.java b/src/main/java/io/bitsquare/trade/protocol/taker/SendTakeOfferFeePayedTxId.java
index 5fc763573b..7630d97e57 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/SendTakeOfferFeePayedTxId.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/SendTakeOfferFeePayedTxId.java
@@ -17,12 +17,15 @@
 
 package io.bitsquare.trade.protocol.taker;
 
-import com.google.bitcoin.core.Coin;
 import io.bitsquare.msg.MessageFacade;
 import io.bitsquare.msg.listeners.OutgoingTradeMessageListener;
 import io.bitsquare.trade.handlers.ExceptionHandler;
 import io.bitsquare.trade.handlers.ResultHandler;
+
+import com.google.bitcoin.core.Coin;
+
 import net.tomp2p.peers.PeerAddress;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/SignAndPublishPayoutTx.java b/src/main/java/io/bitsquare/trade/protocol/taker/SignAndPublishPayoutTx.java
index d0a08c959c..8d6124fbbd 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/SignAndPublishPayoutTx.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/SignAndPublishPayoutTx.java
@@ -17,12 +17,15 @@
 
 package io.bitsquare.trade.protocol.taker;
 
+import io.bitsquare.btc.WalletFacade;
+import io.bitsquare.trade.handlers.ExceptionHandler;
+
 import com.google.bitcoin.core.Coin;
 import com.google.bitcoin.core.Transaction;
 import com.google.bitcoin.core.Utils;
+
 import com.google.common.util.concurrent.FutureCallback;
-import io.bitsquare.btc.WalletFacade;
-import io.bitsquare.trade.handlers.ExceptionHandler;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/TakeOfferFeePayedMessage.java b/src/main/java/io/bitsquare/trade/protocol/taker/TakeOfferFeePayedMessage.java
index f3de5eae59..81acb7648f 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/TakeOfferFeePayedMessage.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/TakeOfferFeePayedMessage.java
@@ -17,9 +17,10 @@
 
 package io.bitsquare.trade.protocol.taker;
 
-import com.google.bitcoin.core.Coin;
 import io.bitsquare.trade.protocol.TradeMessage;
 
+import com.google.bitcoin.core.Coin;
+
 import java.io.Serializable;
 
 public class TakeOfferFeePayedMessage implements Serializable, TradeMessage {
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/VerifyOffererAccount.java b/src/main/java/io/bitsquare/trade/protocol/taker/VerifyOffererAccount.java
index 1ddf474143..0c8c6a1b6c 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/VerifyOffererAccount.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/VerifyOffererAccount.java
@@ -22,6 +22,7 @@ import io.bitsquare.btc.BlockChainFacade;
 import io.bitsquare.trade.handlers.ExceptionHandler;
 import io.bitsquare.trade.handlers.ResultHandler;
 import io.bitsquare.trade.protocol.shared.VerifyPeerAccount;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/user/Arbitrator.java b/src/main/java/io/bitsquare/user/Arbitrator.java
index 5c798f7b02..2524c17c8c 100644
--- a/src/main/java/io/bitsquare/user/Arbitrator.java
+++ b/src/main/java/io/bitsquare/user/Arbitrator.java
@@ -18,6 +18,7 @@
 package io.bitsquare.user;
 
 import java.io.Serializable;
+
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
diff --git a/src/main/java/io/bitsquare/user/User.java b/src/main/java/io/bitsquare/user/User.java
index 0ca523958c..0cb9c4a05d 100644
--- a/src/main/java/io/bitsquare/user/User.java
+++ b/src/main/java/io/bitsquare/user/User.java
@@ -21,16 +21,18 @@ import io.bitsquare.bank.BankAccount;
 import io.bitsquare.util.DSAKeyUtil;
 
 import java.io.Serializable;
+
 import java.security.KeyPair;
 import java.security.PublicKey;
+
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 
-import javax.annotation.Nullable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/util/AWTSystemTray.java b/src/main/java/io/bitsquare/util/AWTSystemTray.java
index 99724fc1d8..79fe6fa7fa 100644
--- a/src/main/java/io/bitsquare/util/AWTSystemTray.java
+++ b/src/main/java/io/bitsquare/util/AWTSystemTray.java
@@ -23,11 +23,11 @@ import io.bitsquare.gui.util.ImageUtil;
 
 import java.awt.*;
 
+import javax.swing.*;
+
 import javafx.application.Platform;
 import javafx.stage.Stage;
 
-import javax.swing.ImageIcon;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/util/Utilities.java b/src/main/java/io/bitsquare/util/Utilities.java
index 15a6eaff2b..f78205bdc4 100644
--- a/src/main/java/io/bitsquare/util/Utilities.java
+++ b/src/main/java/io/bitsquare/util/Utilities.java
@@ -21,12 +21,21 @@ import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import java.awt.Desktop;
-import java.io.*;
+import java.awt.*;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
 import java.net.URI;
+
 import java.util.function.Function;
 
 import javafx.animation.AnimationTimer;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/bitsquare/util/Validator.java b/src/main/java/io/bitsquare/util/Validator.java
index dbfc343f32..d287a49ce0 100644
--- a/src/main/java/io/bitsquare/util/Validator.java
+++ b/src/main/java/io/bitsquare/util/Validator.java
@@ -18,11 +18,11 @@
 package io.bitsquare.util;
 
 import com.google.bitcoin.core.Coin;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.*;
 
 public class Validator {
     private static final Logger log = LoggerFactory.getLogger(Validator.class);
diff --git a/src/test/java/io/bitsquare/BitSquareTestSuite.java b/src/test/java/io/bitsquare/BitSquareTestSuite.java
index cdc8d72a4c..0d4a9e23fa 100644
--- a/src/test/java/io/bitsquare/BitSquareTestSuite.java
+++ b/src/test/java/io/bitsquare/BitSquareTestSuite.java
@@ -22,6 +22,7 @@ import io.bitsquare.gui.util.BitSquareConverterTest;
 import io.bitsquare.gui.util.BitSquareNumberValidatorTest;
 import io.bitsquare.gui.util.FiatValidatorTest;
 import io.bitsquare.msg.P2PNodeTest;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/src/test/java/io/bitsquare/btc/BtcValidatorTest.java b/src/test/java/io/bitsquare/btc/BtcValidatorTest.java
index f8f379e21d..e119bb0882 100644
--- a/src/test/java/io/bitsquare/btc/BtcValidatorTest.java
+++ b/src/test/java/io/bitsquare/btc/BtcValidatorTest.java
@@ -19,10 +19,10 @@ package io.bitsquare.btc;
 
 import com.google.bitcoin.core.Coin;
 import com.google.bitcoin.core.Transaction;
+
 import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class BtcValidatorTest {
     @Test
diff --git a/src/test/java/io/bitsquare/gui/util/BitSquareNumberValidatorTest.java b/src/test/java/io/bitsquare/gui/util/BitSquareNumberValidatorTest.java
index 09c0745136..1afabfd79d 100644
--- a/src/test/java/io/bitsquare/gui/util/BitSquareNumberValidatorTest.java
+++ b/src/test/java/io/bitsquare/gui/util/BitSquareNumberValidatorTest.java
@@ -19,8 +19,7 @@ package io.bitsquare.gui.util;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class BitSquareNumberValidatorTest {
     @Test
diff --git a/src/test/java/io/bitsquare/gui/util/BtcValidatorTest.java b/src/test/java/io/bitsquare/gui/util/BtcValidatorTest.java
index 7dbad12846..92743d09cf 100644
--- a/src/test/java/io/bitsquare/gui/util/BtcValidatorTest.java
+++ b/src/test/java/io/bitsquare/gui/util/BtcValidatorTest.java
@@ -19,10 +19,10 @@ package io.bitsquare.gui.util;
 
 import com.google.bitcoin.core.Coin;
 import com.google.bitcoin.core.NetworkParameters;
+
 import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class BtcValidatorTest {
     @Test
diff --git a/src/test/java/io/bitsquare/gui/util/FiatValidatorTest.java b/src/test/java/io/bitsquare/gui/util/FiatValidatorTest.java
index f0fd9c34df..db15ab1dd9 100644
--- a/src/test/java/io/bitsquare/gui/util/FiatValidatorTest.java
+++ b/src/test/java/io/bitsquare/gui/util/FiatValidatorTest.java
@@ -19,8 +19,7 @@ package io.bitsquare.gui.util;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class FiatValidatorTest {
     @Test
diff --git a/src/test/java/io/bitsquare/msg/P2PNodeTest.java b/src/test/java/io/bitsquare/msg/P2PNodeTest.java
index fa3359cb0f..cdda2d21fb 100644
--- a/src/test/java/io/bitsquare/msg/P2PNodeTest.java
+++ b/src/test/java/io/bitsquare/msg/P2PNodeTest.java
@@ -18,11 +18,18 @@
 package io.bitsquare.msg;
 
 import java.io.IOException;
-import java.security.*;
+
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+
 import java.util.Random;
 
 import net.tomp2p.connection.Ports;
-import net.tomp2p.dht.*;
+import net.tomp2p.dht.FutureGet;
+import net.tomp2p.dht.FuturePut;
+import net.tomp2p.dht.FutureRemove;
+import net.tomp2p.dht.PeerBuilderDHT;
+import net.tomp2p.dht.PeerDHT;
 import net.tomp2p.futures.FutureDirect;
 import net.tomp2p.p2p.PeerBuilder;
 import net.tomp2p.peers.Number160;
@@ -30,8 +37,10 @@ import net.tomp2p.peers.PeerAddress;
 import net.tomp2p.rpc.ObjectDataReply;
 import net.tomp2p.storage.Data;
 import net.tomp2p.utils.Utils;
+
 import org.junit.Assert;
 import org.junit.Test;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/test/java/io/bitsquare/msg/UtilsDHT2.java b/src/test/java/io/bitsquare/msg/UtilsDHT2.java
index a6c1fb5161..d78c8e07d8 100644
--- a/src/test/java/io/bitsquare/msg/UtilsDHT2.java
+++ b/src/test/java/io/bitsquare/msg/UtilsDHT2.java
@@ -20,9 +20,15 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NavigableSet;
+import java.util.Random;
+import java.util.TreeSet;
 
 import net.tomp2p.connection.Bindings;
 import net.tomp2p.dht.PeerBuilderDHT;
@@ -34,7 +40,11 @@ import net.tomp2p.message.Message.Type;
 import net.tomp2p.p2p.AutomaticFuture;
 import net.tomp2p.p2p.Peer;
 import net.tomp2p.p2p.PeerBuilder;
-import net.tomp2p.peers.*;
+import net.tomp2p.peers.Number160;
+import net.tomp2p.peers.PeerAddress;
+import net.tomp2p.peers.PeerMap;
+import net.tomp2p.peers.PeerMapConfiguration;
+import net.tomp2p.peers.PeerSocketAddress;
 
 public class UtilsDHT2 {
     /**