WIP: Refactoring

Hey @rkiany