Removing commented-out code
Removing unused config variable
Better indentation
Fix indentation
Fixing a bug in XOR adding when in multi-thread mode
More tests
More tests