Refactor collisionresponse to 100 line limit
Refactor for 100-line limit and general cleanup