Fix bug in Tp preparation time for Hashtable, AVLtree. small cleanup