feat(refactor): minor refactors and general improvements