Refactoring. And continued with basic actions