feat: minor refactor in processor and generator