simplify dodge(s) code and comment it
(cherry picked from commit cc0e0e7c47e4f5aefe7524e72e94d1e827c9e6ea)