Little tweaks
Improves performance