Add name to results
Remove garbage code