Rubocop recomended fixes
Merge branch 'rubocop-fixes'