Cleanup, moving some stuff around.