Refactor store action creation