Updated comments, vars, class name and file name