Implemented comments from PR