Big Order ID Refactor
* Slight cleanup for batch mode

Change-Id: Ibb1f79e3d8e5a5b8524af1a91dad46db09b883c5