Updates based on feedback.

Make added code consistent with the rest of the project.