Made few changes to commenting and public and private methods and
ambiguous variable names