Refactored code, added weight and shipping method to export