Re-formatting
Update to work with 2.1.0 final
Define 'column' variable before the for loop like it was