diff --git a/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java b/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java
index 6ae14a58e..a9d8483fa 100644
--- a/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java
+++ b/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java
@@ -70,8 +70,7 @@ public class EspressoTestUtils {
                     }
 
                     uiController.loopMainThreadForAtLeast(50);
-                }
-                while (System.currentTimeMillis() < endTime);
+                } while (System.currentTimeMillis() < endTime);
 
                 // timeout happens
                 throw new PerformException.Builder()
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java
index 0acfe60bf..fe2baf92b 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java
@@ -62,7 +62,7 @@ public class UserInterfacePreferencesFragment extends PreferenceFragmentCompat {
                         final Context context = getActivity();
                         final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages);
                         final String[] navTags = context.getResources().getStringArray(R.array.back_button_go_to_pages_tags);
-                        final String choice[] = { UserPreferences.getBackButtonGoToPage() };
+                        final String[] choice = { UserPreferences.getBackButtonGoToPage() };
 
                         AlertDialog.Builder builder = new AlertDialog.Builder(context);
                         builder.setTitle(R.string.back_button_go_to_page_title);
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 04c841b3b..d36c1585a 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -33,8 +33,14 @@
             <property name="tokens"
                       value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
         </module>
+        <module name="RightCurly">
+            <property name="id" value="RightCurlySame"/>
+            <property name="tokens"
+                      value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
+        </module>
         <module name="OneStatementPerLine"/>
         <module name="MultipleVariableDeclarations"/>
+        <module name="ArrayTypeStyle"/>
         <module name="FallThrough"/>
         <module name="UpperEll"/>
         <module name="ModifierOrder"/>
@@ -74,6 +80,11 @@
             <message key="name.invalidPattern"
                      value="Type name ''{0}'' must match pattern ''{1}''."/>
         </module>
+        <module name="LambdaParameterName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
         <module name="CatchParameterName">
             <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
             <message key="name.invalidPattern"
@@ -121,6 +132,11 @@
             <property name="tokens" value="VARIABLE_DEF"/>
             <property name="allowSamelineMultipleAnnotations" value="true"/>
         </module>
+        <module name="AtclauseOrder">
+            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
+            <property name="target"
+                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+        </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
             <message key="name.invalidPattern"
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java
index 19ef3d36f..d5bcdbda0 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java
@@ -58,7 +58,7 @@ public class ExoPlayerWrapper implements IPlayer {
 
         bufferingUpdateDisposable = Observable.interval(2, TimeUnit.SECONDS)
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(aLong -> {
+                .subscribe(tickNumber -> {
                         if (bufferingUpdateListener != null) {
                             bufferingUpdateListener.onBufferingUpdate(null, mExoPlayer.getBufferedPercentage());
                         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/RewindAfterPauseUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/RewindAfterPauseUtils.java
index d1818aeef..366f86707 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/RewindAfterPauseUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/RewindAfterPauseUtils.java
@@ -40,8 +40,7 @@ public class RewindAfterPauseUtils {
             int newPosition = currentPosition - (int) rewindTime;
 
             return newPosition > 0 ? newPosition : 0;
-        }
-        else {
+        } else {
             return currentPosition;
         }
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/syndication/HtmlToPlainText.java b/core/src/main/java/de/danoeh/antennapod/core/util/syndication/HtmlToPlainText.java
index 84d98a905..baa467acf 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/syndication/HtmlToPlainText.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/syndication/HtmlToPlainText.java
@@ -89,14 +89,11 @@ public class HtmlToPlainText {
             String name = node.nodeName();
             if (node instanceof TextNode) {
                 append(((TextNode) node).text()); // TextNodes carry all user-readable text in the DOM.
-            }
-            else if (name.equals("li")) {
+            } else if (name.equals("li")) {
                 append("\n * ");
-            }
-            else if (name.equals("dt")) {
+            } else if (name.equals("dt")) {
                 append("  ");
-            }
-            else if (StringUtil.in(name, "p", "h1", "h2", "h3", "h4", "h5", "tr")) {
+            } else if (StringUtil.in(name, "p", "h1", "h2", "h3", "h4", "h5", "tr")) {
                 append("\n");
             }
         }