cleanup - moved things around