Cleaned up some logic in transaction ORM Class