Refactoring of the Cop code.
Cops, you should keep moving.