Performance tuning
Minor tweaks