Improve the readability and bring clarity, then work on modernity.