DataRetransmitted refactoring

Change-Id: I058aaf8eab14e5e4f13dd10528ac584c94577d7e
Signed-off-by: Andrey Shamis <lolnik@gmail.com>