update to use list comp