More consistent variable and proc names. Comments.