Refactor main interface argument handling