[Issue #74][Reviewed] corrected some of the code-review comments
[Issue #74][Updating] Changed most of the code acc. to reviewer comments