Refactored the bitpay class a little