Class cleanup.

Added comments and cleaned up variable names.