Code organization & removal of interal logging for option setting