feat(#5): major improvements and refactors