RuboCop improvements
Merge pull request #55 from Helabs/tb/rubocop-improvements

RuboCop improvements