diff --git a/core/src/main/java/org/bitcoinj/core/FullPrunedBlockChain.java b/core/src/main/java/org/bitcoinj/core/FullPrunedBlockChain.java
index eaf1ae95..a66cde95 100644
--- a/core/src/main/java/org/bitcoinj/core/FullPrunedBlockChain.java
+++ b/core/src/main/java/org/bitcoinj/core/FullPrunedBlockChain.java
@@ -341,10 +341,10 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
         return new TransactionOutputChanges(txOutsCreated, txOutsSpent);
     }
 
-    @Override
     /**
      * Used during reorgs to connect a block previously on a fork
      */
+    @Override
     protected synchronized TransactionOutputChanges connectTransactions(StoredBlock newBlock)
             throws VerificationException, BlockStoreException, PrunedException {
         checkState(lock.isHeldByCurrentThread());
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientConnection.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientConnection.java
index 3a9faa10..2c093ff2 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientConnection.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientConnection.java
@@ -210,21 +210,7 @@ public class PaymentChannelClientConnection {
     public ListenableFuture<PaymentIncrementAck> incrementPayment(Coin size) throws ValueOutOfRangeException, IllegalStateException {
         return channelClient.incrementPayment(size, null, null);
     }
-    /**
-     * Increments the total value which we pay the server.
-     *
-     * @param size How many satoshis to increment the payment by (note: not the new total).
-     * @param info Information about this payment increment, used to extend this protocol.
-     * @throws ValueOutOfRangeException If the size is negative or would pay more than this channel's total value
-     *                                  ({@link PaymentChannelClientConnection#state()}.getTotalValue())
-     * @throws IllegalStateException If the channel has been closed or is not yet open
-     *                               (see {@link PaymentChannelClientConnection#getChannelOpenFuture()} for the second)
-     */
-    /*
-    public ListenableFuture<PaymentIncrementAck> incrementPayment(Coin size, ByteString info) throws ValueOutOfRangeException, IllegalStateException {
-        return channelClient.incrementPayment(size, info, null);
-    }
-*/
+
     /**
      * Increments the total value which we pay the server.
      *
diff --git a/core/src/main/java/org/bitcoinj/utils/BtcFormat.java b/core/src/main/java/org/bitcoinj/utils/BtcFormat.java
index eacbfe0f..dc65e7b5 100644
--- a/core/src/main/java/org/bitcoinj/utils/BtcFormat.java
+++ b/core/src/main/java/org/bitcoinj/utils/BtcFormat.java
@@ -1107,9 +1107,7 @@ public abstract class BtcFormat extends Format {
         return new BtcFixedFormat(locale, scale, minDecimals, groups);
     }
 
-    /***********************/
-    /****** FORMATTING *****/
-    /***********************/
+    // ****** FORMATTING *****
 
     /**
      * Formats a bitcoin monetary value and returns an {@link java.text.AttributedCharacterIterator}.
@@ -1295,9 +1293,7 @@ public abstract class BtcFormat extends Format {
         return satoshis;
     }
 
-    /********************/
-    /****** PARSING *****/
-    /********************/
+    // ****** PARSING *****
 
     /**
       * Parse a <code>String</code> representation of a Bitcoin monetary value.  Returns a
@@ -1461,9 +1457,7 @@ public abstract class BtcFormat extends Format {
         return (Coin)parseObject(source);
     }
 
-    /*********************************/
     /****** END OF PARSING STUFF *****/
-    /*********************************/
 
     protected static String prefixCode(String code, int scale) {
         switch (scale) {
diff --git a/core/src/main/java/org/bitcoinj/wallet/Wallet.java b/core/src/main/java/org/bitcoinj/wallet/Wallet.java
index 0c41873d..1a466c17 100644
--- a/core/src/main/java/org/bitcoinj/wallet/Wallet.java
+++ b/core/src/main/java/org/bitcoinj/wallet/Wallet.java
@@ -437,7 +437,7 @@ public class Wallet extends BaseTaggableObject
         }
     }
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Key Management
 
@@ -1288,7 +1288,7 @@ public class Wallet extends BaseTaggableObject
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Serialization support
 
@@ -1626,7 +1626,7 @@ public class Wallet extends BaseTaggableObject
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Inbound transaction reception and processing
 
@@ -2531,7 +2531,7 @@ public class Wallet extends BaseTaggableObject
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Event listeners
 
@@ -2791,7 +2791,7 @@ public class Wallet extends BaseTaggableObject
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Vending transactions and other internal state
 
@@ -3432,7 +3432,7 @@ public class Wallet extends BaseTaggableObject
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Balance and balance futures
 
@@ -3662,7 +3662,7 @@ public class Wallet extends BaseTaggableObject
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Creating and sending transactions
 
@@ -4286,8 +4286,7 @@ public class Wallet extends BaseTaggableObject
 
     //endregion
 
-    /******************************************************************************************************************/
-
+    // ***************************************************************************************************************
     /**
      * A custom {@link TransactionOutput} that is free standing. This contains all the information
      * required for spending without actually having all the linked data (i.e parent tx).
@@ -4337,10 +4336,7 @@ public class Wallet extends BaseTaggableObject
         }
     }
 
-    /******************************************************************************************************************/
-
-
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     private static class TxOffsetPair implements Comparable<TxOffsetPair> {
         public final Transaction tx;
@@ -4691,7 +4687,7 @@ public class Wallet extends BaseTaggableObject
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Extensions to the wallet format.
 
@@ -4938,7 +4934,7 @@ public class Wallet extends BaseTaggableObject
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Wallet maintenance transactions
 
diff --git a/core/src/test/java/org/bitcoinj/net/NetworkAbstractionTests.java b/core/src/test/java/org/bitcoinj/net/NetworkAbstractionTests.java
index af0fbebd..e4f8daa6 100644
--- a/core/src/test/java/org/bitcoinj/net/NetworkAbstractionTests.java
+++ b/core/src/test/java/org/bitcoinj/net/NetworkAbstractionTests.java
@@ -363,7 +363,7 @@ public class NetworkAbstractionTests {
 
     @Test
     public void largeDataTest() throws Exception {
-        /** Test various large-data handling, essentially testing {@link ProtobufConnection#receiveBytes(java.nio.ByteBuffer)} */
+        // Test various large-data handling, essentially testing {@link ProtobufConnection#receiveBytes(java.nio.ByteBuffer)}
         final SettableFuture<Void> serverConnectionOpen = SettableFuture.create();
         final SettableFuture<Void> clientConnectionOpen = SettableFuture.create();
         final SettableFuture<Void> serverConnectionClosed = SettableFuture.create();