cleanup, move stuff around