Refactor Act, using STM directly