Folders follow up

Initial follow-up, still some pending
Should probably use something else here as you're redefining the `results` variable, which threw me off when reading the function