Cleanup
Move a few things around.