Fixing Rubocop complaints
Merge remote-tracking branch 'origin/fixing-rubocop-complaints' into rspec3ify