- Minor performance tuning