Refactor: Block -> Stmt