Small  clean ups