Refactor action classes.