backfill - minor code re-order

This reording of some code results in cleaner logic