minor optim