Cleaned up the code a bit, removed unsued library, made the Hashtable more tidy