Improved style some more.