Improvement to code style.