Minor refactoring in JobsPaymentListener and added more abstractions