more refactorings of Decisions to Actions