diff --git a/app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultVoterViewHolder.kt b/app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultVoterViewHolder.kt
index 24d024e3f..f88f9acf3 100644
--- a/app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultVoterViewHolder.kt
+++ b/app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultVoterViewHolder.kt
@@ -45,12 +45,13 @@ class PollResultVoterViewHolder(
     }
 
     private fun getAvatarDraweeController(pollDetail: PollDetails): DraweeController? {
+        var draweeController: DraweeController? = null
         if (pollDetail.actorType == "guests") {
             var displayName = NextcloudTalkApplication.sharedApplication?.resources?.getString(R.string.nc_guest)
             if (!TextUtils.isEmpty(pollDetail.actorDisplayName)) {
                 displayName = pollDetail.actorDisplayName!!
             }
-            return Fresco.newDraweeControllerBuilder()
+            draweeController = Fresco.newDraweeControllerBuilder()
                 .setAutoPlayAnimations(true)
                 .setImageRequest(
                     DisplayUtils.getImageRequestForUrl(
@@ -64,7 +65,7 @@ class PollResultVoterViewHolder(
                 )
                 .build()
         } else if (pollDetail.actorType == "users") {
-            return Fresco.newDraweeControllerBuilder()
+            draweeController = Fresco.newDraweeControllerBuilder()
                 .setAutoPlayAnimations(true)
                 .setImageRequest(
                     DisplayUtils.getImageRequestForUrl(
@@ -78,6 +79,6 @@ class PollResultVoterViewHolder(
                 )
                 .build()
         }
-        return null
+        return draweeController
     }
 }
diff --git a/app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultsAdapter.kt b/app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultsAdapter.kt
index 8260b1641..f70f8393c 100644
--- a/app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultsAdapter.kt
+++ b/app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultsAdapter.kt
@@ -34,25 +34,25 @@ class PollResultsAdapter(
     internal var list: MutableList<PollResultItem> = ArrayList()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PollResultViewHolder {
+        var viewHolder: PollResultViewHolder? = null
+
         when (viewType) {
             PollResultHeaderItem.VIEW_TYPE -> {
                 val itemBinding = PollResultHeaderItemBinding.inflate(
                     LayoutInflater.from(parent.context), parent,
                     false
                 )
-                return PollResultHeaderViewHolder(itemBinding)
+                viewHolder = PollResultHeaderViewHolder(itemBinding)
             }
             PollResultVoterItem.VIEW_TYPE -> {
                 val itemBinding = PollResultVoterItemBinding.inflate(
                     LayoutInflater.from(parent.context), parent,
                     false
                 )
-                return PollResultVoterViewHolder(user, itemBinding)
+                viewHolder = PollResultVoterViewHolder(user, itemBinding)
             }
         }
-
-        val itemBinding = PollResultHeaderItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return PollResultHeaderViewHolder(itemBinding)
+        return viewHolder!!
     }
 
     override fun onBindViewHolder(holder: PollResultViewHolder, position: Int) {
diff --git a/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollResultsViewModel.kt b/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollResultsViewModel.kt
index 6644b487b..a5581f94a 100644
--- a/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollResultsViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollResultsViewModel.kt
@@ -40,7 +40,6 @@
 
 package com.nextcloud.talk.polls.viewmodels
 
-import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -86,7 +85,7 @@ class PollResultsViewModel @Inject constructor() : ViewModel() {
         _items.value = ArrayList()
 
         val votersAmount = getVotersAmount(poll)
-        val oneVoteInPercent = 100 / votersAmount
+        val oneVoteInPercent = HUNDRED / votersAmount
 
         poll.options?.forEachIndexed { index, option ->
             val votersAmountForThisOption = getVotersAmountForOption(poll, index)
@@ -117,13 +116,13 @@ class PollResultsViewModel @Inject constructor() : ViewModel() {
     }
 
     private fun getVotersAmount(poll: Poll): Int {
+        var votersAmount = 0
         if (poll.details != null) {
-            return poll.details.size
+            votersAmount = poll.details.size
         } else if (poll.votes != null) {
-            return poll.numVoters
+            votersAmount = poll.numVoters
         }
-        Log.e(TAG, "something went wrong while getting amount of voters.")
-        return 0
+        return votersAmount
     }
 
     private fun getVotersAmountForOption(poll: Poll, index: Int): Int {
@@ -156,5 +155,6 @@ class PollResultsViewModel @Inject constructor() : ViewModel() {
 
     companion object {
         private val TAG = PollResultsViewModel::class.java.simpleName
+        private const val HUNDRED = 100
     }
 }