Merge "Category finder style cleanups"