Refactor to fix Rubocop offenses

Refactor to fix Rubocop offenses, so the build doesn't look "broken"