diff --git a/pubs/commands/list_cmd.py b/pubs/commands/list_cmd.py
index c3e98a2..1874a3e 100644
--- a/pubs/commands/list_cmd.py
+++ b/pubs/commands/list_cmd.py
@@ -28,25 +28,24 @@ def parser(subparsers):
     return parser
 
 
-def date_added(np):
-    n, p = np
+def date_added(p):
     return p.added or datetime(1, 1, 1)
 
 
 def command(args):
     ui = get_ui()
     rp = repo.Repository(config())
-    papers = filter(lambda (n, p):
-            filter_paper(p, args.query, case_sensitive=args.case_sensitive),
-            enumerate(rp.all_papers()))
+    papers = filter(lambda p: filter_paper(p, args.query,
+                                           case_sensitive=args.case_sensitive),
+                    rp.all_papers())
     if args.alphabetical:
-        papers = sorted(papers, key=lambda p: p[1].citekey)
+        papers = sorted(papers, key=lambda p: p.citekey)
     else:
         papers = sorted(papers, key=date_added)
     if len(papers) > 0:
         ui.print_('\n'.join(
-            pretty.paper_oneliner(p, n=n, citekey_only=args.citekeys)
-            for n, p in papers))
+            pretty.paper_oneliner(p, citekey_only=args.citekeys)
+            for p in papers))
 
 
 FIELD_ALIASES = {
diff --git a/pubs/commands/tag_cmd.py b/pubs/commands/tag_cmd.py
index 203a5c7..3f700ee 100644
--- a/pubs/commands/tag_cmd.py
+++ b/pubs/commands/tag_cmd.py
@@ -103,10 +103,10 @@ def command(args):
             all_tags += tags
             included, excluded = _tag_groups(_parse_tags(all_tags))
             papers_list = []
-            for n, p in enumerate(rp.all_papers()):
+            for p in rp.all_papers():
                 if (p.tags.issuperset(included) and
                     len(p.tags.intersection(excluded)) == 0):
-                    papers_list.append((p, n))
+                    papers_list.append(p)
 
-            ui.print_('\n'.join(pretty.paper_oneliner(p, n)
-                                for p, n in papers_list))
+            ui.print_('\n'.join(pretty.paper_oneliner(p)
+                                for p in papers_list))
diff --git a/pubs/pretty.py b/pubs/pretty.py
index 6d0a2c7..6e9854f 100644
--- a/pubs/pretty.py
+++ b/pubs/pretty.py
@@ -48,7 +48,7 @@ def bib_desc(bib_data):
     return s
 
 
-def paper_oneliner(p, n = 0, citekey_only = False):
+def paper_oneliner(p, citekey_only = False):
     if citekey_only:
         return p.citekey
     else: