code cleanup and adding a demoTransactionSigner