Continue refactoring Action