Code cleanup, and final RTT time estimations