Refactoring [WIP]