Improved code style.