Small code tweaks for readability.