Renamed variable and removed log dep
Renamed variables
Transactions and type handling