[+] Some refactoring