Add categories for code clarity