Cleanup / simplify Block API / Code