Remove export logic and update argument parsing flow per pull request feedback