Minor tweaks for better code re-use