Reordering columns.

In addition, commenting some code.
Merge pull request #1 from htobon/master

Reordering columns.