Add uniq - clean up some method calls