fixed variables name and comments