Cleaned up helper classes to remove warnings.

Finished commenting helper code.