Minor code clarity tweaks (and comments)