Small fix
Finish refactoring action