Cleaning up Transaction class