Huge Update to cleaning