Minor adjustments to var and comments.