Improved style? maybe