[REFACTOR] Basic refactoring