Improve the style, more OO.