Refactor transaction class

Left these in by accident?