Small refactoring for Option Builder