cleaned up h classes