Reordering columns.

In addition, commenting some code.