Minor cleanup of some old code I forgot to remove.
Also output slightly cleaner in case of no results.