Finish BPR calcs, plus DRY organization