Refactored to use renderer model
Refactored comments branch to renderer
Added configuration option
Added paramters to method summary