Micro optimize rendering
Merge pull request #242 from arv/optimize-rendering

Optimize rendering