feat: refactor a bit #18

Closed j178 closed 1 year ago