diff --git a/app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt
index 7a96a7c50d81ecfe786f47ea4d291113e668965a..66b2205ada6a06490313713d104d04c2d79a74a0 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt
@@ -338,7 +338,7 @@ class QuasselService : DaggerLifecycleService(),
     fun launch(
       context: Context,
       disconnect: Boolean? = null
-    ) = context.startService(intent(context, disconnect))
+    ): ComponentName = context.startService(intent(context, disconnect))
 
     fun intent(
       context: Context,
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ssl/BrowserCompatibleHostnameVerifier.kt b/app/src/main/java/de/kuschku/quasseldroid/ssl/BrowserCompatibleHostnameVerifier.kt
index baf8bb6fb8174a2dac8b9a3f9bae4cea2023abea..cbb6affbfbd3763256ac5a25cce0d08dc648a6f6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ssl/BrowserCompatibleHostnameVerifier.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ssl/BrowserCompatibleHostnameVerifier.kt
@@ -25,7 +25,6 @@ class BrowserCompatibleHostnameVerifier : HostnameVerifier {
       .filterNotNull()
       .distinct()
 
-  private val COMMON_NAME = Regex("""(?:^|,\s?)(?:CN=("(?:[^"]|"")+"|[^,]+))""")
   private fun commonName(certificate: X509Certificate): String? {
     return COMMON_NAME.find(certificate.subjectX500Principal.name)?.groups?.get(1)?.value
   }
@@ -42,4 +41,8 @@ class BrowserCompatibleHostnameVerifier : HostnameVerifier {
     }.map { (_, name) ->
       name
     }
+
+  companion object {
+    private val COMMON_NAME = Regex("""(?:^|,\s?)(?:CN=("(?:[^"]|"")+"|[^,]+))""")
+  }
 }
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt
index 40a96701c5b96344b64c2df1f562519d4b04e3a2..0c654179c65b99a139de5f4b6d6c34e3e97224c6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt
@@ -24,7 +24,7 @@ import de.kuschku.quasseldroid.viewmodel.data.AutoCompleteItem
 import de.kuschku.quasseldroid.viewmodel.data.BufferStatus
 
 class AutoCompleteHelper(
-  private val activity: FragmentActivity,
+  activity: FragmentActivity,
   private val autoCompleteSettings: AutoCompleteSettings,
   private val messageSettings: MessageSettings,
   private val ircFormatDeserializer: IrcFormatDeserializer,
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/EditorHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/EditorHelper.kt
index 2deefe127386ee1e8979550f63d1bc665cf3a560..f91fa1023e5c0b77dc0ab9af9773b531416023c5 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/EditorHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/EditorHelper.kt
@@ -42,7 +42,8 @@ class EditorHelper(
     getColor(0, 0)
   }
 
-  val lastWord = BehaviorSubject.createDefault(Pair("", IntRange.EMPTY))
+  val lastWord: BehaviorSubject<Pair<String, IntRange>> = BehaviorSubject.createDefault(Pair("",
+                                                                                             IntRange.EMPTY))
   private val textWatcher = object : TextWatcher {
     override fun afterTextChanged(s: Editable?) {
       val previous = autoCompleteHelper.autoCompletionState
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragmentProvider.kt
index 3892a6474f2004e61dd02c489943a555304bf864..c4ef1db3de6d84cf4be1d6738d95daaaa226cf88 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragmentProvider.kt
@@ -6,5 +6,5 @@ import dagger.android.ContributesAndroidInjector
 @Module
 abstract class CoreSettingsFragmentProvider {
   @ContributesAndroidInjector
-  abstract fun CoreSettingsFragmentbind(): CoreSettingsFragment
+  abstract fun bindCoreSettingsFragment(): CoreSettingsFragment
 }
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountAdapter.kt
index f236d115fa25237f5ed42a33ad0deaa42e111b79..6d90d6d060b9cacd27bc618df1e1a987a320da1e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountAdapter.kt
@@ -21,8 +21,8 @@ import de.kuschku.quasseldroid.util.helper.zip
 
 class AccountAdapter(
   owner: LifecycleOwner,
-  val liveData: LiveData<List<AccountDatabase.Account>>,
-  val selectedItem: MutableLiveData<Pair<Long, Long>>
+  liveData: LiveData<List<AccountDatabase.Account>>,
+  private val selectedItem: MutableLiveData<Pair<Long, Long>>
 ) : RecyclerView.Adapter<AccountAdapter.AccountViewHolder>() {
   private val actionListeners = mutableSetOf<(Long) -> Unit>()
   private val addListeners = mutableSetOf<() -> Unit>()
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/backport/codec/Hex.kt b/app/src/main/java/de/kuschku/quasseldroid/util/backport/codec/Hex.kt
index 1f927f44aed7ba2c6316baaa318b72ce3c05a31d..1fc09c423196f210f88b0ae7444dac65d1590611 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/backport/codec/Hex.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/backport/codec/Hex.kt
@@ -78,7 +78,7 @@ class Hex : BinaryEncoder, BinaryDecoder {
    * @since 1.4
    * @since 1.7 throws UnsupportedCharsetException if the named charset is unavailable
    */
-  constructor(charsetName: String) : this(Charset.forName(charsetName)) {}
+  constructor(charsetName: String) : this(Charset.forName(charsetName))
 
   /**
    * Converts an array of character bytes representing hexadecimal values into an array of bytes of those same values.
@@ -120,7 +120,7 @@ class Hex : BinaryEncoder, BinaryDecoder {
    * same values. The returned array will be half the length of the passed String or array, as it takes two characters
    * to represent any given byte. An exception is thrown if the passed char array has an odd number of elements.
    *
-   * @param object
+   * @param obj
    * A String, ByteBuffer, byte[], or an array of character bytes containing hexadecimal digits
    * @return A byte array containing binary data decoded from the supplied byte array (representing characters).
    * @throws DecoderException
@@ -129,20 +129,13 @@ class Hex : BinaryEncoder, BinaryDecoder {
    * @see .decodeHex
    */
   @Throws(DecoderException::class)
-  override fun decode(`object`: Any): Any {
-    return if (`object` is String) {
-      decode(`object`.toCharArray())
-    } else if (`object` is ByteArray) {
-      decode(`object`)
-    } else if (`object` is ByteBuffer) {
-      decode(`object`)
-    } else {
-      try {
-        decodeHex(`object` as CharArray)
-      } catch (e: ClassCastException) {
-        throw DecoderException(e.message, e)
-      }
-
+  override fun decode(obj: Any): Any {
+    return when (obj) {
+      is String     -> decode(obj.toCharArray())
+      is ByteArray  -> decode(obj)
+      is ByteBuffer -> decode(obj)
+      is CharArray  -> decodeHex(obj)
+      else          -> throw DecoderException()
     }
   }
 
@@ -196,7 +189,7 @@ class Hex : BinaryEncoder, BinaryDecoder {
    * [.getCharset].
    *
    *
-   * @param object
+   * @param obj
    * a String, ByteBuffer, or byte[] to convert to Hex characters
    * @return A char[] containing lower-case hexadecimal characters
    * @throws EncoderException
@@ -204,22 +197,14 @@ class Hex : BinaryEncoder, BinaryDecoder {
    * @see .encodeHex
    */
   @Throws(EncoderException::class)
-  override fun encode(`object`: Any): Any {
-    val byteArray: ByteArray
-    if (`object` is String) {
-      byteArray = `object`.toByteArray(this.charset)
-    } else if (`object` is ByteBuffer) {
-      byteArray = `object`.array()
-    } else {
-      try {
-        byteArray = `object` as ByteArray
-      } catch (e: ClassCastException) {
-        throw EncoderException(e.message, e)
-      }
-
+  override fun encode(obj: Any) = encodeHex(
+    when (obj) {
+      is String     -> obj.toByteArray(charset)
+      is ByteBuffer -> obj.array()
+      is ByteArray  -> obj
+      else          -> throw EncoderException()
     }
-    return encodeHex(byteArray)
-  }
+  )
 
   /**
    * Returns a string representation of the object, which includes the charset name.
@@ -237,14 +222,14 @@ class Hex : BinaryEncoder, BinaryDecoder {
      *
      * @since 1.7
      */
-    val DEFAULT_CHARSET = Charsets.UTF_8
+    val DEFAULT_CHARSET: Charset = Charsets.UTF_8
 
     /**
      * Default charset name is [CharEncoding.UTF_8]
      *
      * @since 1.4
      */
-    val DEFAULT_CHARSET_NAME = CharEncoding.UTF_8
+    const val DEFAULT_CHARSET_NAME = CharEncoding.UTF_8
 
     /**
      * Used to build output as Hex
@@ -387,7 +372,7 @@ class Hex : BinaryEncoder, BinaryDecoder {
      * For best results, this should be either upper- or lower-case hex.
      * @since 1.4
      */
-    protected fun encodeHex(data: ByteArray, toDigits: CharArray): CharArray {
+    private fun encodeHex(data: ByteArray, toDigits: CharArray): CharArray {
       val l = data.size
       val out = CharArray(l shl 1)
       // two characters form the hex value.
@@ -414,7 +399,7 @@ class Hex : BinaryEncoder, BinaryDecoder {
      * For best results, this should be either upper- or lower-case hex.
      * @since 1.11
      */
-    protected fun encodeHex(data: ByteBuffer, toDigits: CharArray): CharArray {
+    private fun encodeHex(data: ByteBuffer, toDigits: CharArray): CharArray {
       return encodeHex(data.array(), toDigits)
     }
 
@@ -486,7 +471,7 @@ class Hex : BinaryEncoder, BinaryDecoder {
      * Thrown if ch is an illegal hex character
      */
     @Throws(DecoderException::class)
-    protected fun toDigit(ch: Char, index: Int): Int {
+    private fun toDigit(ch: Char, index: Int): Int {
       val digit = Character.digit(ch, 16)
       if (digit == -1) {
         throw DecoderException("Illegal hexadecimal character $ch at index $index")
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/GsonHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/GsonHelper.kt
index 310f9f8ec47cfe7b937e93199f03dc9b807e66e1..00b9606a698cabe5122dc008f77ddff14df9a7e4 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/GsonHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/GsonHelper.kt
@@ -3,5 +3,5 @@ package de.kuschku.quasseldroid.util.helper
 import com.google.gson.Gson
 import java.io.File
 
-inline fun <reified T> Gson.fromJson(file: File) = this.fromJson(file.reader(), T::class.java)
-inline fun <reified T> Gson.fromJson(text: String) = this.fromJson(text, T::class.java)
+inline fun <reified T> Gson.fromJson(file: File): T = this.fromJson(file.reader(), T::class.java)
+inline fun <reified T> Gson.fromJson(text: String): T = this.fromJson(text, T::class.java)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBackgroundColorSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBackgroundColorSpan.kt
index 8a4562753cd702bab97e9622fed12d5b899a0b30..ad2448d92716c4912ca95c7d4756071b52668b87 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBackgroundColorSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBackgroundColorSpan.kt
@@ -5,7 +5,7 @@ import android.text.style.BackgroundColorSpan
 
 sealed class IrcBackgroundColorSpan<T : IrcBackgroundColorSpan<T>>(@ColorInt color: Int) :
   BackgroundColorSpan(color), Copyable<T> {
-  class MIRC(val mircColor: Int, @ColorInt color: Int) :
+  class MIRC(private val mircColor: Int, @ColorInt color: Int) :
     IrcBackgroundColorSpan<MIRC>(color), Copyable<MIRC> {
     override fun copy() = MIRC(mircColor, backgroundColor)
   }
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcForegroundColorSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcForegroundColorSpan.kt
index 36acd5aae9bd2f68846979a60a581ffb4b7251a5..f211fee8a37bb118708d220885fa50ad42845d74 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcForegroundColorSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcForegroundColorSpan.kt
@@ -5,7 +5,7 @@ import android.text.style.ForegroundColorSpan
 
 sealed class IrcForegroundColorSpan<T : IrcForegroundColorSpan<T>>(@ColorInt color: Int) :
   ForegroundColorSpan(color), Copyable<T> {
-  class MIRC(val mircColor: Int, @ColorInt color: Int) :
+  class MIRC(private val mircColor: Int, @ColorInt color: Int) :
     IrcForegroundColorSpan<MIRC>(color), Copyable<MIRC> {
     override fun copy() = MIRC(mircColor, foregroundColor)
   }
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/service/BackendServiceConnection.kt b/app/src/main/java/de/kuschku/quasseldroid/util/service/BackendServiceConnection.kt
index 2375ca2a7c6c9f8f9b47afd9f20df23bcf36bb60..556f16ff4d8be8437be72f848de2c6aed2be87e4 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/service/BackendServiceConnection.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/service/BackendServiceConnection.kt
@@ -12,7 +12,7 @@ import de.kuschku.quasseldroid.service.QuasselService
 import io.reactivex.subjects.BehaviorSubject
 
 class BackendServiceConnection : ServiceConnection {
-  val backend = BehaviorSubject.createDefault(Optional.empty<Backend>())
+  val backend: BehaviorSubject<Optional<Backend>> = BehaviorSubject.createDefault(Optional.empty())
 
   var context: Context? = null
 
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/SeekBarPreference.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/SeekBarPreference.kt
index 390d097d354544156bdd63e5ed8256973cce04a0..35bc50d535e0485c2f38190c5c5c0153cdd709a0 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/SeekBarPreference.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/SeekBarPreference.kt
@@ -29,8 +29,6 @@ import butterknife.ButterKnife
 import de.kuschku.quasseldroid.R
 
 class SeekBarPreference : Preference, SeekBar.OnSeekBarChangeListener {
-  private val TAG = javaClass.name
-
   private var maxValue = 100
   private var minValue = 0
   private var interval = 1
@@ -85,7 +83,7 @@ class SeekBarPreference : Preference, SeekBar.OnSeekBarChangeListener {
       if (newInterval != null)
         interval = Integer.parseInt(newInterval)
     } catch (e: Exception) {
-      Log.e(TAG, "Invalid interval value", e)
+      Log.e("SeekBarPreference", "Invalid interval value", e)
     }
   }
 
@@ -139,7 +137,7 @@ class SeekBarPreference : Preference, SeekBar.OnSeekBarChangeListener {
       try {
         temp = defaultValue as Int
       } catch (ex: Exception) {
-        Log.e(TAG, "Invalid default value: " + defaultValue.toString())
+        Log.e("SeekBarPreference", "Invalid default value: " + defaultValue.toString())
       }
       persistInt(temp)
       currentValue = temp
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/TextDrawable.java b/app/src/main/java/de/kuschku/quasseldroid/util/ui/TextDrawable.java
index 7938d6c385c527733d01125558539209dabb45bc..d045d0be3faa9869ce3f6bfa7d8011990a2a1723 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/TextDrawable.java
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/TextDrawable.java
@@ -15,7 +15,7 @@ import android.graphics.drawable.shapes.RoundRectShape;
 
 /**
  * @author amulya
- * @datetime 14 Oct 2014, 3:53 PM
+ * created 14 Oct 2014
  */
 public class TextDrawable extends ShapeDrawable {
 
@@ -23,7 +23,6 @@ public class TextDrawable extends ShapeDrawable {
   private final Paint textPaint;
   private final Paint borderPaint;
   private final String text;
-  private final int color;
   private final RectShape shape;
   private final int height;
   private final int width;
@@ -42,7 +41,6 @@ public class TextDrawable extends ShapeDrawable {
 
     // text and color
     text = builder.toUpperCase ? builder.text.toUpperCase() : builder.text;
-    color = builder.color;
 
     // text paint settings
     fontSize = builder.fontSize;
@@ -58,13 +56,13 @@ public class TextDrawable extends ShapeDrawable {
     // border paint settings
     borderThickness = builder.borderThickness;
     borderPaint = new Paint();
-    borderPaint.setColor(getDarkerShade(color));
+    borderPaint.setColor(getDarkerShade(builder.color));
     borderPaint.setStyle(Paint.Style.STROKE);
     borderPaint.setStrokeWidth(borderThickness);
 
     // drawable paint color
     Paint paint = getPaint();
-    paint.setColor(color);
+    paint.setColor(builder.color);
 
   }
 
@@ -142,49 +140,46 @@ public class TextDrawable extends ShapeDrawable {
   }
 
   public interface IConfigBuilder {
-    public IConfigBuilder width(int width);
+    IConfigBuilder width(int width);
 
-    public IConfigBuilder height(int height);
+    IConfigBuilder height(int height);
 
-    public IConfigBuilder textColor(int color);
+    IConfigBuilder textColor(int color);
 
-    public IConfigBuilder withBorder(int thickness);
+    IConfigBuilder withBorder(int thickness);
 
-    public IConfigBuilder useFont(Typeface font);
+    IConfigBuilder useFont(Typeface font);
 
-    public IConfigBuilder fontSize(int size);
+    IConfigBuilder fontSize(int size);
 
-    public IConfigBuilder bold();
+    IConfigBuilder bold();
 
-    public IConfigBuilder toUpperCase();
+    IConfigBuilder toUpperCase();
 
-    public IShapeBuilder endConfig();
+    IShapeBuilder endConfig();
   }
 
-  public static interface IBuilder {
-
-    public TextDrawable build(String text, int color);
+  public interface IBuilder {
+    TextDrawable build(String text, int color);
   }
 
-  public static interface IShapeBuilder {
-
-    public IConfigBuilder beginConfig();
+  public interface IShapeBuilder {
+    IConfigBuilder beginConfig();
 
-    public IBuilder rect();
+    IBuilder rect();
 
-    public IBuilder round();
+    IBuilder round();
 
-    public IBuilder roundRect(int radius);
+    IBuilder roundRect(int radius);
 
-    public TextDrawable buildRect(String text, int color);
+    TextDrawable buildRect(String text, int color);
 
-    public TextDrawable buildRoundRect(String text, int color, int radius);
+    TextDrawable buildRoundRect(String text, int color, int radius);
 
-    public TextDrawable buildRound(String text, int color);
+    TextDrawable buildRound(String text, int color);
   }
 
   public static class Builder implements IConfigBuilder, IShapeBuilder, IBuilder {
-
     public int textColor;
     public float radius;
     private String text;
@@ -307,4 +302,4 @@ public class TextDrawable extends ShapeDrawable {
       return new TextDrawable(this);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/widget_spinner_item_inline.xml b/app/src/main/res/layout/widget_spinner_item_inline.xml
index 12b041f585489b5716aa5c6e67585bb735a2b119..f4ca0d0a8bea07d075cfc85b34f19d576e030ce9 100644
--- a/app/src/main/res/layout/widget_spinner_item_inline.xml
+++ b/app/src/main/res/layout/widget_spinner_item_inline.xml
@@ -2,9 +2,9 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@android:id/text1"
   style="@style/Widget.RtlConformTextView"
-  android:gravity="center_vertical"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
+  android:gravity="center_vertical"
   android:minHeight="?listPreferredItemHeightSmall"
   android:paddingLeft="16dp"
   android:paddingRight="16dp"
diff --git a/app/src/main/res/layout/widget_spinner_item_toolbar.xml b/app/src/main/res/layout/widget_spinner_item_toolbar.xml
index 1ee4e670a33eb0f648e556df7873fad94b186d26..d07ca38fb660d8602f295aadc75738c5401c4244 100644
--- a/app/src/main/res/layout/widget_spinner_item_toolbar.xml
+++ b/app/src/main/res/layout/widget_spinner_item_toolbar.xml
@@ -2,9 +2,9 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@android:id/text1"
   style="@style/Widget.RtlConformTextView"
-  android:gravity="center_vertical"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
+  android:gravity="center_vertical"
   android:minHeight="?attr/actionBarSize"
   android:paddingLeft="16dp"
   android:paddingRight="16dp"
diff --git a/app/src/main/res/values/styles_widgets.xml b/app/src/main/res/values/styles_widgets.xml
index 64c83761a1bf7d389fe5e0a96bb74abcec3f2ba7..82c3b3f2b2998ed71b04682a7f796331e2ca234e 100644
--- a/app/src/main/res/values/styles_widgets.xml
+++ b/app/src/main/res/values/styles_widgets.xml
@@ -2,7 +2,7 @@
 
   <style name="Widget" />
 
-  <style name="Widget.RtlConformTextView" parent=""></style>
+  <style name="Widget.RtlConformTextView" parent="" />
 
   <style name="Widget.Button.Borderless" parent="Widget.AppCompat.Button.Borderless">
     <item name="android:textColor">?attr/colorTextPrimary</item>
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/LegacyFeature.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/LegacyFeature.kt
index 203a1522596f64df3bc8c166b71be52025e4b4b6..0c3bb295185d633de5fda3958dc28a31a26a5d85 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/LegacyFeature.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/LegacyFeature.kt
@@ -51,21 +51,21 @@ enum class LegacyFeature(override val bit: Int) :
     fun fromExtended(it: ExtendedFeature) = when (it) {
       ExtendedFeature.SynchronizedMarkerLine -> LegacyFeature.SynchronizedMarkerLine
       ExtendedFeature.SaslAuthentication     -> LegacyFeature.SaslAuthentication
-      ExtendedFeature.SaslExternal         -> LegacyFeature.SaslExternal
-      ExtendedFeature.HideInactiveNetworks -> LegacyFeature.HideInactiveNetworks
-      ExtendedFeature.PasswordChange       -> LegacyFeature.PasswordChange
-      ExtendedFeature.CapNegotiation       -> LegacyFeature.CapNegotiation
-      ExtendedFeature.VerifyServerSSL      -> LegacyFeature.VerifyServerSSL
-      ExtendedFeature.CustomRateLimits     -> LegacyFeature.CustomRateLimits
-      ExtendedFeature.DccFileTransfer      -> LegacyFeature.DccFileTransfer
-      ExtendedFeature.AwayFormatTimestamp  -> LegacyFeature.AwayFormatTimestamp
-      ExtendedFeature.Authenticators       -> LegacyFeature.Authenticators
-      ExtendedFeature.BufferActivitySync   -> LegacyFeature.BufferActivitySync
-      ExtendedFeature.CoreSideHighlights   -> LegacyFeature.CoreSideHighlights
-      ExtendedFeature.SenderPrefixes       -> LegacyFeature.SenderPrefixes
-      ExtendedFeature.RemoteDisconnect     -> LegacyFeature.RemoteDisconnect
-      ExtendedFeature.ExtendedFeatures     -> LegacyFeature.ExtendedFeatures
-      else                                 -> null
+      ExtendedFeature.SaslExternal           -> LegacyFeature.SaslExternal
+      ExtendedFeature.HideInactiveNetworks   -> LegacyFeature.HideInactiveNetworks
+      ExtendedFeature.PasswordChange         -> LegacyFeature.PasswordChange
+      ExtendedFeature.CapNegotiation         -> LegacyFeature.CapNegotiation
+      ExtendedFeature.VerifyServerSSL        -> LegacyFeature.VerifyServerSSL
+      ExtendedFeature.CustomRateLimits       -> LegacyFeature.CustomRateLimits
+      ExtendedFeature.DccFileTransfer        -> LegacyFeature.DccFileTransfer
+      ExtendedFeature.AwayFormatTimestamp    -> LegacyFeature.AwayFormatTimestamp
+      ExtendedFeature.Authenticators         -> LegacyFeature.Authenticators
+      ExtendedFeature.BufferActivitySync     -> LegacyFeature.BufferActivitySync
+      ExtendedFeature.CoreSideHighlights     -> LegacyFeature.CoreSideHighlights
+      ExtendedFeature.SenderPrefixes         -> LegacyFeature.SenderPrefixes
+      ExtendedFeature.RemoteDisconnect       -> LegacyFeature.RemoteDisconnect
+      ExtendedFeature.ExtendedFeatures       -> LegacyFeature.ExtendedFeatures
+      else                                   -> null
     }
   }
 
diff --git a/slidingpanel/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java b/slidingpanel/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java
index 9feba814eefe8e00d9d81cc0a83ff5b0d798b373..5e69370808c7aab788851eb3e3b1d00b747ce61f 100644
--- a/slidingpanel/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java
+++ b/slidingpanel/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java
@@ -77,7 +77,7 @@ public class SlidingUpPanelLayout extends ViewGroup {
   /**
    * Default initial state for the component
    */
-  private static PanelState DEFAULT_SLIDE_STATE = PanelState.COLLAPSED;
+  private static final PanelState DEFAULT_SLIDE_STATE = PanelState.COLLAPSED;
   /**
    * The paint used to dim the main layout when sliding
    */