diff --git a/src/main/java/io/bitsquare/btc/BlockChainFacade.java b/src/main/java/io/bitsquare/btc/BlockChainFacade.java
index 1a38a295c3..a288e513f1 100644
--- a/src/main/java/io/bitsquare/btc/BlockChainFacade.java
+++ b/src/main/java/io/bitsquare/btc/BlockChainFacade.java
@@ -42,33 +42,28 @@ public class BlockChainFacade {
     }
 
     private boolean findAddressInBlockChain(String address) {
-        // TODO
-        // lookup for address in blockchain
+        // TODO lookup for address in blockchain
         return true;
     }
 
 
     private byte[] getDataForTxWithAddress(String address) {
-        // TODO
-        // return data after OP_RETURN
+        // TODO return data after OP_RETURN
         return null;
     }
 
     private boolean isFeePayed(String address) {
-        // TODO
-        // check if fee is payed
+        // TODO check if fee is paid
         return true;
     }
 
     private boolean isAccountIDBlacklisted(String accountID) {
-        // TODO
-        // check if accountID is on blacklist
+        // TODO check if accountID is on blacklist
         return false;
     }
 
     private boolean isBankAccountBlacklisted(BankAccount bankAccount) {
-        // TODO
-        // check if accountID is on blacklist
+        // TODO check if accountID is on blacklist
         return false;
     }
 }
diff --git a/src/main/java/io/bitsquare/gui/settings/SettingsController.java b/src/main/java/io/bitsquare/gui/settings/SettingsController.java
index 8d3df331b7..54cefd651d 100644
--- a/src/main/java/io/bitsquare/gui/settings/SettingsController.java
+++ b/src/main/java/io/bitsquare/gui/settings/SettingsController.java
@@ -162,8 +162,7 @@ public class SettingsController extends CachedViewController {
 
     @Override
     public ViewController loadViewAndGetChildController(NavigationItem navigationItem) {
-        // TODO
-        // caching causes exception
+        // TODO caching causes exception
         final GuiceFXMLLoader loader = new GuiceFXMLLoader(getClass().getResource(navigationItem.getFxmlUrl()), false);
         try {
             final Node view = loader.load();