Adaptions to new style guide.