Cleanup. Minor changes.