remove lifetime in some structs