Done with tha fixing
Cleanup