Further improvements
Transformed render into module