refactoring
Refactoring
Added def actions