[+] Still Cleaning up code