Refactor render
Merge pull request #95 from troopjs/feature/refactor-render

Refactor render