Clean up CategoryFilter
Fix checkstyle