Updated based on pull request comments

Updated several files to fit suggestions from the pull request.