minor performance opt
performance improved