Optimized and cleaned CollisionSolver code
Removed Line class