Improved style again