fixed hash table?
cleanup and formatting