Minor changes in comments and variable naming.