[+] Refactoring
[+] Refactoring