clean up arguments to structs