Folders follow up

Initial follow-up, still some pending
Can you fix the spacing around `callback` here?