minor optims