removed unused strings and added "name"