cleanup
block improvements