Fixing more lint warnings

Created by: mippzon

Tested to create a local branch, fixing some lint warnings, merge that branch to my local master, push everything to Github and now pull request to upstream origin.