Rendering and code style improvements