Addressed issues on PR