Renamed the variables & methods as per coding coventions