feat: minor refactors