More Rubocop warnings fixes
Merge pull request #78 from zertico/rubocop

More Rubocop warnings fixes