[REFACTORING]