Refactored collision system