Filter out irrelevant results, slight cleanup