Comments + cleanup

Additional comments explaining all members of the class, and reordering
of a few members to make the code more readable.