Improved visual quality
Readability fixes