Now with list comprehensions, better names, and less variables.