Cleaned OptionBuilder