Improved coding style.