Fixing some rubocop issues