Address additional rubocop warnings
Merge pull request #110 from tas50/master

Address additional rubocop warnings