Using list comprehension for performance refs #12