Some refactoring actions, adding simple logic to confirmations