Refactoring @WIP