Classify options and add comments