Better structured the action class