Folders follow up

Initial follow-up, still some pending
Can you add some spacing around `callback` ?