Another small change, removed BLOCK_SIZE and BLOCK_PADDING