[Issue #77][Fixing] Fixed reviewers comments