Minor code & comment tweaks