Action/Function refactoring.