Issue 93 - Completed Owner Tags

Same as the title.
can we indent this line? It's awkward to read through.
(same on the other list comprehension on line 165)