Improve Coding style.