More minor clean up.