Don't switch lanes if current lane has enough space already; remove some garbage code