Added a clear class, and cleaned up some code