[1466] explicit types for hashmap
[1466] use hashtable; slightly better variable names