refactor: minor refactors