some cleanup, updated the block