Fixing Rubocop issues