Refactor collision