Optimization tips

Optimization tips