REFACTOR separating paymentdecorator, payment and account concerns