List comprehension service cleaned up a lot