removed useless define and expanded hash table