Updates to reflect comments from github