Thanks to testing, I improved my code!

Made a fix to remove and improved some other stuff. Adding more testing