Some minor clean up.