Minor code tweaks for Office Hours 9.5 (a)