Merge pull request #1749 from nnnick/fix/code-climate

Fix some issues found by code climate