No unnecessary boxing, enhanced for loops, redundant checks and throws,
imports (removal, reordering), possible void returns
Change-Id: I7a8e1b2007e3b0906e01b41785c518d02c2f3fab
* Somehow there are multiple entries per some numbers, sometimes stored
with, sometimes without spaces and/or invisible characters
* This leads to the same number being shown multiple times
* Don't add those entries by comparing number and type of all
already added entries with the staging one
Change-Id: Ic815393d3d4f4ba56107f42c9d8940309564554c
Michael W
Aurimas Liutikas
Mike Dodd