structure: more cleanups