Tweaks found during code walkthrough