Conforming to latest style guidelines.