convert map/filter + lambda to list-comprehension

Change-Id: I62b86cd035f1f2866c4b59c0b24ccf5089255ec8