Refactors render methods to eliminate duplicated code
Merge pull request #18 from davefp/master

Refactors render methods to extracts duplicate code