Minor changes..
Minor changes. Renaming of variables.