Cleaned up Collision Detection