Small clean ups