Use getColumnRender rather than the raw value

Also, lots of tidying and better names.