Action must implement update method + cleanup actions
Replace some code with util methods