refactored fieldlist/identifierlist/type