Rubocop linting fixes