Sanitized some more code