Code cleanup
Using List instead of array for hashing