Addressed comments for pull request (squash this commit when merging).