feat: minor improvements and refactors