refactoring :collision: