DRY'ed out subcategories, remove unnecessary CSS classes