Updated with suggestions from SmartViking

removed "list_of_" from variables  and  updated list comprehensions