Addressing mklucsarits CR comments

This PR aims to address the following CR comments from @mklucsarits 

https://github.com/Wikia/app/pull/3649#discussion_r17540140
https://github.com/Wikia/app/pull/3649#discussion_r17540725
https://github.com/Wikia/app/pull/3649#discussion_r17590461
https://github.com/Wikia/app/pull/3649#discussion_r17590591
https://github.com/Wikia/app/pull/3649#discussion_r17590806
https://github.com/Wikia/app/pull/3649#discussion_r17591324