Stmt package:refact