Minor code tweaks for clarity