Remove state from OptionList classes' init()

Quite forgetful.
Organize all classes