BPay - cleanups and formatting