further code cleanup and gestpay_s2s advancement