Minor changes, cleanup.