[Refactor] Improve type safety

**Is your feature request related to a problem? Please describe.**
Conversion to typescript was made by a newbie. Me. We should definitely improve it

**Describe the solution you'd like**
Any type improvement is welcome

