Improve alignment and naming style in block.c