cleanup
Moved some stuff around.