Minor cleanup of structs