more rubocop offensives fixed