Fix comments and incorrect variable