refactorings: removed "_charge" from variable names; transaction_type mapping; splats