Adpation to style guide.