Resolve issues from codeclimate#19

WTFKr0 merged 3 commits into

masterwtfcoderz/streamlist:masterfrom

codeclimate-issueswtfcoderz/streamlist:codeclimate-issuesCopy head branch name to clipboard