diff --git a/1ano/fp/aula08/names.py b/1ano/fp/aula08/names.py
index a5f66f5..469fd2d 100644
--- a/1ano/fp/aula08/names.py
+++ b/1ano/fp/aula08/names.py
@@ -1,12 +1,9 @@
 def main():
     with open('names.txt', 'r') as f:
         names = f.read().split('\n')
-        surnames = set([name.split(' ')[-1] for name in names[1:]])
-        namesDict = {}
-        for surname in surnames:
-            namesDict[surname] = set([name.split(' ')[0] for name in names[1:] if surname in name and surname != ''])
+        namesDict = {surname: set([name.split(' ')[0] for name in names[1:] if surname in name])
+                     for surname in set([name.split(' ')[-1] for name in names[1:] if name != ''])}
 
-        del namesDict['']
         printNames(namesDict)