[+] Refactoring + improvements