Merge "Minor code comment tweaks for spelling and consistency"