[Enhacement] Refactor code

[okbalefthanded]

The current code contains a lot of duplication, and since the core features are mature and stable enough; a general refactor is required.