Removed another use of dictionary comprehenstion