Refactor all Actions!!