refactored pull request #7 based on the review comment