Fixing rubocop issues