Some cleanup. Use a class (OptionInfo) instead of a pair of a pair and remove