Improving code style.