Major style improvements to be continued.