Refactor: re-iterating over #add (lines 3-6)