Addressed issues in PR review