Convert some stuff to list comprehensions.