Cleaned up the everything