Refactor class of collisions