[ ! ] Refactoring