fixed some more comments based on PR review