Some cleanup + added more options for NUM_KEYS for finer load factor control.