Cleanup. Minor changes