Refactoring markup for transaction components