Improve coding style.