use struct when available, list comp instead of map()#2