Improved style but still a lot to do there