started refactoring the action parts