diff --git a/res/values/strings.xml b/res/values/strings.xml
index eb564c207e..307c000c62 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1572,7 +1572,7 @@
     <!-- Conversation list activity -->
     <string name="activity_conversation_list_empty_state_message">Looks like you don\'t have any conversations yet. Get started by messaging a friend.</string>
     <!-- Settings activity -->
-    <string name="activity_settings_secondary_device_tag">This is a secondary device</string>
+    <string name="activity_settings_secondary_device_tag">Secondary device</string>
     <string name="activity_settings_public_key_copied_message">Copied to clipboard</string>
     <string name="activity_settings_share_public_key_button_title">Share Public Key</string>
     <string name="activity_settings_show_qr_code_button_title">Show QR Code</string>
diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index e12ea412fb..f1c3c872db 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -126,7 +126,7 @@ import static nl.komponents.kovenant.android.KovenantAndroid.stopKovenant;
 public class ApplicationContext extends MultiDexApplication implements DependencyInjector, DefaultLifecycleObserver, LokiP2PAPIDelegate {
 
   private static final String TAG = ApplicationContext.class.getSimpleName();
-  private final static int OK_HTTP_CACHE_SIZE = 10 * 1024 * 1024; // 10MB
+  private final static int OK_HTTP_CACHE_SIZE = 10 * 1024 * 1024; // 10 MB
 
   private ExpiringMessageManager  expiringMessageManager;
   private TypingStatusRepository  typingStatusRepository;
diff --git a/src/org/thoughtcrime/securesms/loki/FriendRequestHandler.kt b/src/org/thoughtcrime/securesms/loki/FriendRequestHandler.kt
index bb58f3dd88..050f9a1bb6 100644
--- a/src/org/thoughtcrime/securesms/loki/FriendRequestHandler.kt
+++ b/src/org/thoughtcrime/securesms/loki/FriendRequestHandler.kt
@@ -29,7 +29,6 @@ object FriendRequestHandler {
       DatabaseFactory.getLokiThreadDatabase(context).setFriendRequestStatus(threadId, threadFriendStatus)
     }
 
-
     // Update message status
     if (messageId >= 0) {
       val messageDatabase = DatabaseFactory.getLokiMessageDatabase(context)
diff --git a/src/org/thoughtcrime/securesms/loki/LokiPublicChatPoller.kt b/src/org/thoughtcrime/securesms/loki/LokiPublicChatPoller.kt
index cbaa33cf65..28bca2fea1 100644
--- a/src/org/thoughtcrime/securesms/loki/LokiPublicChatPoller.kt
+++ b/src/org/thoughtcrime/securesms/loki/LokiPublicChatPoller.kt
@@ -146,7 +146,6 @@ class LokiPublicChatPoller(private val context: Context, private val group: Loki
                 PushDecryptJob(context).handleTextMessage(serviceContent, serviceDataMessage, Optional.absent(), Optional.of(message.serverID))
             }
         }
-
         fun processOutgoingMessage(message: LokiPublicChatMessage) {
             val messageServerID = message.serverID ?: return
             val isDuplicate = DatabaseFactory.getLokiMessageDatabase(context).getMessageID(messageServerID) != null
@@ -162,7 +161,6 @@ class LokiPublicChatPoller(private val context: Context, private val group: Loki
                 PushDecryptJob(context).handleSynchronizeSentTextMessage(transcript)
             }
         }
-
         api.getMessages(group.channel, group.server).successBackground { messages ->
             if (messages.isNotEmpty()) {
                 val ourDevices = LokiStorageAPI.shared.getAllDevicePublicKeys(userHexEncodedPublicKey).get(setOf())
diff --git a/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt b/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt
index 16be98fd73..9ad53944a5 100644
--- a/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt
@@ -68,7 +68,7 @@ class NewConversationActivity : PassphraseRequiredActionBarActivity(), ScanListe
     fun startNewConversationIfPossible(hexEncodedPublicKey: String) {
         if (!PublicKeyValidation.isValid(hexEncodedPublicKey)) { return Toast.makeText(this, R.string.fragment_new_conversation_invalid_public_key_message, Toast.LENGTH_SHORT).show() }
         val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(this)
-        // If we try to contact our master then redirect to note to self
+        // If we try to contact our master device then redirect to note to self
         val contactPublicKey = if (TextSecurePreferences.getMasterHexEncodedPublicKey(this) == hexEncodedPublicKey) userHexEncodedPublicKey else hexEncodedPublicKey
         val contact = Recipient.from(this, Address.fromSerialized(contactPublicKey), true)
         val intent = Intent(this, ConversationActivity::class.java)
diff --git a/src/org/thoughtcrime/securesms/loki/PushBackgroundMessageSendJob.kt b/src/org/thoughtcrime/securesms/loki/PushBackgroundMessageSendJob.kt
index 7533609185..0c7e055ff1 100644
--- a/src/org/thoughtcrime/securesms/loki/PushBackgroundMessageSendJob.kt
+++ b/src/org/thoughtcrime/securesms/loki/PushBackgroundMessageSendJob.kt
@@ -15,10 +15,10 @@ import java.io.IOException
 import java.util.concurrent.TimeUnit
 
 class PushBackgroundMessageSendJob private constructor(
-        parameters: Parameters,
-        private val recipient: String,
-        private val messageBody: String?,
-        private val friendRequest: Boolean
+    parameters: Parameters,
+    private val recipient: String,
+    private val messageBody: String?,
+    private val friendRequest: Boolean
 ) : BaseJob(parameters) {
   companion object {
     const val KEY = "PushBackgroundMessageSendJob"
diff --git a/src/org/thoughtcrime/securesms/loki/PushMessageSyncSendJob.kt b/src/org/thoughtcrime/securesms/loki/PushMessageSyncSendJob.kt
index 6d451c2bc4..f18e941fda 100644
--- a/src/org/thoughtcrime/securesms/loki/PushMessageSyncSendJob.kt
+++ b/src/org/thoughtcrime/securesms/loki/PushMessageSyncSendJob.kt
@@ -14,12 +14,12 @@ import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class PushMessageSyncSendJob private constructor(
-        parameters: Parameters,
-        private val messageID: Long,
-        private val recipient: Address,
-        private val timestamp: Long,
-        private val message: ByteArray,
-        private val ttl: Int
+    parameters: Parameters,
+    private val messageID: Long,
+    private val recipient: Address,
+    private val timestamp: Long,
+    private val message: ByteArray,
+    private val ttl: Int
 ) : BaseJob(parameters), InjectableType {
 
   companion object {