Refactor optional argument experiment