Improved tho code style.