more cleanups / sanitized structure