More minor clean up.
More minor clean up.