fix: improve code base and clean-up logic

- break-out large functions
- move redundant logic into helper functions
- improve error handling
- improve type checking