Cleanup, moved things around.