Follow up on folders code review