Update to fit new style guide.