minor cleanup
added new field 'type'