Removed typedef of structs