RuboCop fixes
Merge pull request #388 from Helabs/tb/rubocop-fixes

RuboCop fixes