Refactor for transactions n that
Cleanup Code