diff --git a/app/src/main/java/com/h/pixeldroid/objects/Account.kt b/app/src/main/java/com/h/pixeldroid/objects/Account.kt
index d5fadda0..c6b0e37c 100644
--- a/app/src/main/java/com/h/pixeldroid/objects/Account.kt
+++ b/app/src/main/java/com/h/pixeldroid/objects/Account.kt
@@ -4,7 +4,6 @@ package com.h.pixeldroid.objects
 Represents a user and their associated profile.
 https://docs.joinmastodon.org/entities/account/
  */
-
 data class Account(
         //Base attributes
         val id: String,
diff --git a/app/src/main/java/com/h/pixeldroid/objects/Status.kt b/app/src/main/java/com/h/pixeldroid/objects/Status.kt
index 0b72dfbd..589aeb48 100644
--- a/app/src/main/java/com/h/pixeldroid/objects/Status.kt
+++ b/app/src/main/java/com/h/pixeldroid/objects/Status.kt
@@ -14,12 +14,12 @@ data class Status(
     val visibility: Visibility,
     val sensitive: Boolean,
     val spoiler_text: String,
-    val media_attachments: ArrayList<Attachment>,
+    val media_attachments: List<Attachment>,
     val application: Application,
     //Rendering attributes
-    val mentions: ArrayList<Mention>,
-    val tags: ArrayList<Tag>,
-    val emojis: ArrayList<Emoji>,
+    val mentions: List<Mention>,
+    val tags: List<Tag>,
+    val emojis: List<Emoji>,
     //Informational attributes
     val reblogs_count: Int,
     val favourites_count: Int,