Minor updates in inline comments and namings.