Clean up comments, break up large methods, spill based on actual block size, and properly increment _diskBytesSpilled