Cleaned up some stuff from the other SpreadHash version