Refactored internal actions.