Worsen readability and fixes.