Review Code Duplication

Find copied logic that should be shared, and say where the shared version should live.

• find
• code