some clean up, move stuff around