actions refactoring