Tweak tender event content and code cleanup