Code clarity, tweaks.