Addressed style feedback.