refactor(wip): complete refactoring in progress