Major cleanup. Hope it works.