Refactoring of collision?