Some minor clean up here and there.