Cleaned up BlockSizeCalculator and things connected to it