some more refactoring using the new mentalstate/executors