refactor: cleanup default optional default arguments handling