Some cleanup,some moving