Improve rendering speed
Improve code readability