Changes following comments in PR