[+] Cleaned up code