cleanup / refactor / profiled
refactor remaining transaction objects