[+] Refactoring