Raw render
Stylistic fixes