Minor tweaks for efficiency and style