Updated comments and names of variables