More work on improving code readability for blocks