All: Some minor clean up.