Formatting cleanup
Use xor in hashing instead of addition