[!] Refactoring