Updated a comment.
Updated a comment.
Update final variable names to conform with the standard.