Change lists:map/2 calls to lists comprehensions