fix: reuse functions and some improvements

[mrunderline]

Hi @mihaliak
I've seen your repo and found it useful because I had an idea like yours, so I try to use it.
but while using it, i found some bugs and i try to fix them and implement some improvements...
so here you are, switch conditions converted to same switch cases and main statements moved to related functions.

[mihaliak]

Thanks for the contribution, looks good 👍