Updates based on jbuck's comments in PR