data handler class, and cleanups.