Changes to comply with project code style.