Minor tweaks
Procedure tweak.