added classification code.  Cleanup