minor refactoring

[adamnemecek]

No description provided.

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
6 out of 8 committers have signed the CLA.

✅ kjessup
✅ rymcol
✅ scorovit
✅ Kumuluzz
✅ adamnemecek
✅ RockfordWei
❌ iamjono
❌ Rockford Wei

---

Rockford Wei seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[kandelvijaya]

Thats a lot of changes. Great work however i am not sure weather this changes will be accepted or not. If these changes are to be merged then let me know. I can help review bit by bit.