correct 24 rubocop offenses
Merge branch 'master' into develop