Fix the error in payment factory. + some minor impr.

TRANSACTIONTYPE_PAYMENT would suit better?