Refactor application arguments