Stylistic changes for better rendering