[FIX] Refactoring bridgePayment and validating all required AND optional fields, also ran some code reformatting