Some Additional clean ups