cleaned up a bit
removed transactionexception