Code clean-up
Added comments
Renamed all 'renderer' into 'formatter'