Refactoring around AccountAction