minor performance tuning