Fixed commenting, variables names and file names
Untracked files from last commit