First pass of changes made from comments on PR