refactor: cleanup default arguments handling