Fix number of blocks calculation and change indent.