Fix variable name change
Fix comments