Some cleanup and performance tuning