Major cleanup, Make some changes