Addressed comments from the pull request
LINT fix