Little cleanup in PaymentFlow.java