refactor Blocks