Comment and var fix