minor optmization