Cleanups in structure