removed an unused field, added some type information