Clean Up
Credit to dhacker29 for his work