Refactoring and Fedex delimited file changes