further cleanups
...
app rendering cleanups