addressed some PR comments